From 9fecf487db6c79f9b09deec0098f7c8293c51f69 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Mon, 29 Apr 2024 11:17:30 +0200 Subject: [PATCH 1/2] feat(mods): create, flywheel and kubejs --- README.modrinth.md | 2 ++ modpack/README.md | 2 ++ modpack/changelog.md | 5 +++++ modpack/index.toml | 15 +++++++++++++++ modpack/mods/create.pw.toml | 13 +++++++++++++ modpack/mods/flywheel.pw.toml | 13 +++++++++++++ modpack/mods/kubejs-create.pw.toml | 13 +++++++++++++ modpack/pack.toml | 2 +- 8 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 modpack/mods/create.pw.toml create mode 100644 modpack/mods/flywheel.pw.toml create mode 100644 modpack/mods/kubejs-create.pw.toml diff --git a/README.modrinth.md b/README.modrinth.md index 8ab30cb..918915d 100644 --- a/README.modrinth.md +++ b/README.modrinth.md @@ -75,6 +75,8 @@ Every mod, resourcepack or music included in this modpack can be used freely if - [KubeJS](https://modrinth.com/mod/kubejs) [curseforge but newest versions are on modrinth] -> customize the game with JS - [Architectury API](https://www.curseforge.com/minecraft/mc-mods/architectury) [curseforge but newest versions are on modrinth] -> lib for KubeJS - [Rhino](https://www.curseforge.com/minecraft/mc-mods/rhino) [curseforge but newest versions are on modrinth] -> lib for KubeJS +- [Create](https://www.curseforge.com/minecraft/mc-mods/create) [curseforge but newest versions are on modrinth] -> base of the craft system +- [Flywheel](https://www.curseforge.com/minecraft/mc-mods/flywheel) [curseforge but newest versions are on modrinth] -> lib for Create diff --git a/modpack/README.md b/modpack/README.md index 8ab30cb..918915d 100644 --- a/modpack/README.md +++ b/modpack/README.md @@ -75,6 +75,8 @@ Every mod, resourcepack or music included in this modpack can be used freely if - [KubeJS](https://modrinth.com/mod/kubejs) [curseforge but newest versions are on modrinth] -> customize the game with JS - [Architectury API](https://www.curseforge.com/minecraft/mc-mods/architectury) [curseforge but newest versions are on modrinth] -> lib for KubeJS - [Rhino](https://www.curseforge.com/minecraft/mc-mods/rhino) [curseforge but newest versions are on modrinth] -> lib for KubeJS +- [Create](https://www.curseforge.com/minecraft/mc-mods/create) [curseforge but newest versions are on modrinth] -> base of the craft system +- [Flywheel](https://www.curseforge.com/minecraft/mc-mods/flywheel) [curseforge but newest versions are on modrinth] -> lib for Create diff --git a/modpack/changelog.md b/modpack/changelog.md index baff7dd..4284624 100644 --- a/modpack/changelog.md +++ b/modpack/changelog.md @@ -11,6 +11,11 @@ Replace these mods by their modrinth version: - CoroUtil - ParCool! +Add: +- Create +- Flywheel +- KubeJS Create + ## 0.10.2 **Theoretically compatible with 0.10.0 and 0.10.1 but not tested. Servers are highly encourage to upgrade** diff --git a/modpack/index.toml b/modpack/index.toml index 696039d..c15ccf1 100644 --- a/modpack/index.toml +++ b/modpack/index.toml @@ -469,6 +469,11 @@ file = "mods/craftpresence.pw.toml" hash = "c3874db9feb9c3b9adef86eb27d13b95b310accbdf96cc9d7fd6722d09dc216f" metafile = true +[[files]] +file = "mods/create.pw.toml" +hash = "cf6a575860bb0c9ce92aa33ccf881a6a57363914f3c83487e9743f063fef7a91" +metafile = true + [[files]] file = "mods/creativecore.pw.toml" hash = "04c59cad26fb818ee8c6c361d50d696c53e71ea5473562b3d3f204359c86ccf9" @@ -519,6 +524,11 @@ file = "mods/firstaid.pw.toml" hash = "0eb4c27343f92386c14ca565b835219913213358e659d673b4a88cf83f230a15" metafile = true +[[files]] +file = "mods/flywheel.pw.toml" +hash = "fdde87c3450325f15a72576976f305ca943953650b4c2b63e52186ad54c50307" +metafile = true + [[files]] file = "mods/fx-control.pw.toml" hash = "9c7bc14c64f1f137158c65d87820499e42ba0cde2063be5e3ca80ef0af8c689c" @@ -534,6 +544,11 @@ file = "mods/in-control.pw.toml" hash = "317eb19f430bbc6bc21dc5d605fc1db01c01c35c4d12a5bc6f10cc9d5cccbbee" metafile = true +[[files]] +file = "mods/kubejs-create.pw.toml" +hash = "2788c7385ce99205644eed9455db75f8d29b3a133c50b0c25b46faa7f055c878" +metafile = true + [[files]] file = "mods/kubejs.pw.toml" hash = "03b95396f886a22987e8fee18d1b9855e4f06c09d166e180e3e0339665aeb36b" diff --git a/modpack/mods/create.pw.toml b/modpack/mods/create.pw.toml new file mode 100644 index 0000000..9b4c3b2 --- /dev/null +++ b/modpack/mods/create.pw.toml @@ -0,0 +1,13 @@ +name = "Create" +filename = "create-mc1.16.5_v0.3.2g.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "5b32b0310d037deed14200e3b748bd02d46d9471" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 3536025 +project-id = 328085 diff --git a/modpack/mods/flywheel.pw.toml b/modpack/mods/flywheel.pw.toml new file mode 100644 index 0000000..6b513a8 --- /dev/null +++ b/modpack/mods/flywheel.pw.toml @@ -0,0 +1,13 @@ +name = "Flywheel (Legacy)" +filename = "flywheel-1.16-0.2.5.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "30dbb119ce3d455bee065c0bef04a00827b3a5b3" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 3535459 +project-id = 486392 diff --git a/modpack/mods/kubejs-create.pw.toml b/modpack/mods/kubejs-create.pw.toml new file mode 100644 index 0000000..7ec54ea --- /dev/null +++ b/modpack/mods/kubejs-create.pw.toml @@ -0,0 +1,13 @@ +name = "KubeJS Create" +filename = "kubejs-create-1605.1.4-build.12.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/T38eAZQC/versions/uMNhEyBG/kubejs-create-1605.1.4-build.12.jar" +hash-format = "sha1" +hash = "be87887093cfe365e88ad2422b38e95bfb88326b" + +[update] +[update.modrinth] +mod-id = "T38eAZQC" +version = "uMNhEyBG" diff --git a/modpack/pack.toml b/modpack/pack.toml index 6ea943a..aef8509 100644 --- a/modpack/pack.toml +++ b/modpack/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "ecc94d9c871c2e3ffdcd31ee6701cff1fc9c535670235f7a92230149a52f9b93" +hash = "aeb30610c43bc19187c971a0933e4e5d694f0826a931ece330b1629e4ffc70a1" [versions] forge = "36.2.34" From 884fa28287569dc81299a730996cb447aceb5524 Mon Sep 17 00:00:00 2001 From: Anhgelus Morhtuuzh Date: Mon, 29 Apr 2024 11:19:19 +0200 Subject: [PATCH 2/2] feat(craft): craft made in feat/craft --- .../assets/minecraft/blockstates/vine.json | 120 ----------------- .../kubejs/server_scripts/craft-essentials.js | 121 ++++++++++++++++++ modpack/kubejs/server_scripts/craft-guns.js | 13 ++ modpack/kubejs/server_scripts/craft.js | 35 ----- modpack/kubejs/startup_scripts/items.js | 8 ++ 5 files changed, 142 insertions(+), 155 deletions(-) delete mode 100644 modpack/kubejs/assets/minecraft/blockstates/vine.json create mode 100644 modpack/kubejs/server_scripts/craft-essentials.js create mode 100644 modpack/kubejs/server_scripts/craft-guns.js delete mode 100644 modpack/kubejs/server_scripts/craft.js create mode 100644 modpack/kubejs/startup_scripts/items.js diff --git a/modpack/kubejs/assets/minecraft/blockstates/vine.json b/modpack/kubejs/assets/minecraft/blockstates/vine.json deleted file mode 100644 index 5779673..0000000 --- a/modpack/kubejs/assets/minecraft/blockstates/vine.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "variants": { - "east=false,north=false,south=false,up=false,west=false": { - "model": "minecraft:block/vine_1" - }, - "east=false,north=false,south=false,up=false,west=true": { - "model": "minecraft:block/vine_1", - "y": 90 - }, - "east=false,north=false,south=false,up=true,west=false": { - "model": "minecraft:block/vine_u" - }, - "east=false,north=false,south=false,up=true,west=true": { - "model": "minecraft:block/vine_1u", - "y": 90 - }, - "east=false,north=false,south=true,up=false,west=false": { - "model": "minecraft:block/vine_1" - }, - "east=false,north=false,south=true,up=false,west=true": { - "model": "minecraft:block/vine_2", - "y": 180 - }, - "east=false,north=false,south=true,up=true,west=false": { - "model": "minecraft:block/vine_1u" - }, - "east=false,north=false,south=true,up=true,west=true": { - "model": "minecraft:block/vine_2u", - "y": 180 - }, - "east=false,north=true,south=false,up=false,west=false": { - "model": "minecraft:block/vine_1", - "y": 180 - }, - "east=false,north=true,south=false,up=false,west=true": { - "model": "minecraft:block/vine_2", - "y": 270 - }, - "east=false,north=true,south=false,up=true,west=false": { - "model": "minecraft:block/vine_1u", - "y": 180 - }, - "east=false,north=true,south=false,up=true,west=true": { - "model": "minecraft:block/vine_2u", - "y": 270 - }, - "east=false,north=true,south=true,up=false,west=false": { - "model": "minecraft:block/vine_2_opposite", - "y": 90 - }, - "east=false,north=true,south=true,up=false,west=true": { - "model": "minecraft:block/vine_3", - "y": 180 - }, - "east=false,north=true,south=true,up=true,west=false": { - "model": "minecraft:block/vine_2u_opposite", - "y": 90 - }, - "east=false,north=true,south=true,up=true,west=true": { - "model": "minecraft:block/vine_3u", - "y": 180 - }, - "east=true,north=false,south=false,up=false,west=false": { - "model": "minecraft:block/vine_1", - "y": 270 - }, - "east=true,north=false,south=false,up=false,west=true": { - "model": "minecraft:block/vine_2_opposite" - }, - "east=true,north=false,south=false,up=true,west=false": { - "model": "minecraft:block/vine_1u", - "y": 270 - }, - "east=true,north=false,south=false,up=true,west=true": { - "model": "minecraft:block/vine_2u_opposite" - }, - "east=true,north=false,south=true,up=false,west=false": { - "model": "minecraft:block/vine_2", - "y": 90 - }, - "east=true,north=false,south=true,up=false,west=true": { - "model": "minecraft:block/vine_3", - "y": 90 - }, - "east=true,north=false,south=true,up=true,west=false": { - "model": "minecraft:block/vine_2u", - "y": 90 - }, - "east=true,north=false,south=true,up=true,west=true": { - "model": "minecraft:block/vine_3u", - "y": 90 - }, - "east=true,north=true,south=false,up=false,west=false": { - "model": "minecraft:block/vine_2" - }, - "east=true,north=true,south=false,up=false,west=true": { - "model": "minecraft:block/vine_3", - "y": 270 - }, - "east=true,north=true,south=false,up=true,west=false": { - "model": "minecraft:block/vine_2u" - }, - "east=true,north=true,south=false,up=true,west=true": { - "model": "minecraft:block/vine_3u", - "y": 270 - }, - "east=true,north=true,south=true,up=false,west=false": { - "model": "minecraft:block/vine_3" - }, - "east=true,north=true,south=true,up=false,west=true": { - "model": "minecraft:block/vine_4" - }, - "east=true,north=true,south=true,up=true,west=false": { - "model": "minecraft:block/vine_3u" - }, - "east=true,north=true,south=true,up=true,west=true": { - "model": "minecraft:block/vine_4u" - } - } -} \ No newline at end of file diff --git a/modpack/kubejs/server_scripts/craft-essentials.js b/modpack/kubejs/server_scripts/craft-essentials.js new file mode 100644 index 0000000..3c2cd87 --- /dev/null +++ b/modpack/kubejs/server_scripts/craft-essentials.js @@ -0,0 +1,121 @@ +// priority = 0 + +onEvent('recipes', event => { + event.remove({}) + + //crafting table + event.shapeless('4x minecraft:oak_planks', ['minecraft:oak_log']) + event.shapeless('4x minecraft:spruce_planks', ['minecraft:spruce_log']) + event.shapeless('4x minecraft:birch_planks', ['minecraft:birch_log']) + event.shapeless('4x minecraft:jungle_planks', ['minecraft:jungle_log']) + event.shapeless('4x minecraft:acacia_planks', ['minecraft:acacia_log']) + event.shapeless('4x minecraft:dark_oak_planks', ['minecraft:dark_oak_log']) + event.shapeless('4x minecraft:oak_planks', ['minecraft:stripped_oak_log']) + event.shapeless('4x minecraft:spruce_planks', ['minecraft:stripped_spruce_log']) + event.shapeless('4x minecraft:birch_planks', ['minecraft:stripped_birch_log']) + event.shapeless('4x minecraft:jungle_planks', ['minecraft:stripped_jungle_log']) + event.shapeless('4x minecraft:acacia_planks', ['minecraft:stripped_acacia_log']) + event.shapeless('4x minecraft:dark_oak_planks', ['minecraft:stripped_dark_oak_log']) + + event.shapeless('2x minecraft:stick', ['#minecraft:planks', '#minecraft:planks']) + + // Craft + event.shaped('minecraft:crafting_table', [ + 'PP ', + 'PP ', + ' ' + ], { + P: '#minecraft:planks' + }) + event.shaped('minecraft:campfire', [ + ' S ', + 'SCS', + 'LLL' + ], { + S: 'minecraft:stick', + C: 'minecraft:coal', + L: '#minecraft:logs' + }) + event.shaped('minecraft:blast_furnace', [ + 'III', + 'IFI', + 'SSS' + ], { + I: '#forge:ingots/iron', + F: 'minecraft:furnace', + S: 'minecraft:smooth_stone' + }) + event.shaped('minecraft:smoker', [ + ' W ', + 'WFW', + ' C ' + ], { + W: '#minecraft:logs', + F: 'minecraft:furnace', + C: 'minecraft:campfire' + }) + + // Materials + event.shaped('#forge:ingots/iron', [ + 'NN ', + 'NN ', + ' ' + ], { + N: '#forge:nuggets/iron' + }) + event.recipes.createPressing('kubejs:iron_plate', '2x #forge:ingots/iron') + event.recipes.createPressing('kubejs:iron_large_plate', '2x kubejs:iron_plate') + event.shaped('kubejs:iron_long_plate', [ + 'III', + ' ', + ' ' + ], { + I: '#forge:ingots/iron' + }) + event.recipes.createPressing('kubejs:iron_big_plate', ['2x kubejs:iron_large_plate', '2x kubejs:iron_long_plate']) + + // Tools + event.shaped('minecraft:iron_pickaxe', [ + 'III', + ' S ', + ' S ' + ], { + I: '#forge:ingots/iron', + S: 'minecraft:stick' + }) + event.shaped('minecraft:iron_axe', [ + ' II', + ' SI', + ' S ' + ], { + I: '#forge:ingots/iron', + S: 'minecraft:stick' + }) + event.shaped('minecraft:iron_shovel', [ + ' I ', + ' S ', + ' S ' + ], { + I: '#forge:ingots/iron', + S: 'minecraft:stick' + }) + event.shaped('minecraft:iron_hoe', [ + ' II', + ' S ', + ' S ' + ], { + I: '#forge:ingots/iron', + S: 'minecraft:stick' + }) + + // Furnace + event.smelting('#forge:nuggets/iron', 'minecraft:iron_bars') + event.blasting('2x #forge:nuggets/iron', 'minecraft:iron_bars') + + event.smelting('minecraft:cooked_porkchop', 'minecraft:porkchop') + event.smoking('2x minecraft:cooked_porkchop', 'minecraft:porkchop') + + // Campfire + event.campfireCooking('minecraft:porkchop', 'minecraft:rotten_flesh') +}) + diff --git a/modpack/kubejs/server_scripts/craft-guns.js b/modpack/kubejs/server_scripts/craft-guns.js new file mode 100644 index 0000000..ae24837 --- /dev/null +++ b/modpack/kubejs/server_scripts/craft-guns.js @@ -0,0 +1,13 @@ +// priority = 1 + +onEvent('recipes', event => { + // Basic + event.shapeless('minecraft:gunpowder', ['#minecraft:sand', 'minecraft:coal']) + + // Bullets + event.shapeless('tac:9mm_round', ['minecraft:gunpowder', '3x #forge:nuggets/iron']) + event.shapeless('tac:round45', ['minecraft:gunpowder', '#forge:ingots/iron']) + event.shapeless('tac:nato_559_bullet', ['minecraft:gunpowder', '#forge:ingots/iron', '2x #forge:nuggets/iron']) + event.shapeless('tac:10_gauge_round', ['2x minecraft:gunpowder', '#forge:ingots/iron', '#forge:nuggets/iron']) + event.shapeless('tac:win_30-30', ['2x minecraft:gunpowder', '2x #forge:ingots/iron']) +}) diff --git a/modpack/kubejs/server_scripts/craft.js b/modpack/kubejs/server_scripts/craft.js deleted file mode 100644 index 3ea560d..0000000 --- a/modpack/kubejs/server_scripts/craft.js +++ /dev/null @@ -1,35 +0,0 @@ -// priority = 0 - -onEvent('recipes', event => { - event.remove({}) - - //crafting table - event.shapeless('4x minecraft:oak_planks', ['minecraft:oak_log']) - event.shapeless('4x minecraft:spruce_planks', ['minecraft:spruce_log']) - event.shapeless('4x minecraft:birch_planks', ['minecraft:birch_log']) - event.shapeless('4x minecraft:jungle_planks', ['minecraft:jungle_log']) - event.shapeless('4x minecraft:acacia_planks', ['minecraft:acacia_log']) - event.shapeless('4x minecraft:dark_oak_planks', ['minecraft:dark_oak_log']) - event.shapeless('4x minecraft:oak_planks', ['minecraft:stripped_oak_log']) - event.shapeless('4x minecraft:spruce_planks', ['minecraft:stripped_spruce_log']) - event.shapeless('4x minecraft:birch_planks', ['minecraft:stripped_birch_log']) - event.shapeless('4x minecraft:jungle_planks', ['minecraft:stripped_jungle_log']) - event.shapeless('4x minecraft:acacia_planks', ['minecraft:stripped_acacia_log']) - event.shapeless('4x minecraft:dark_oak_planks', ['minecraft:stripped_dark_oak_log']) - - event.shapeless('2x minecraft:stick', ['#minecraft:planks', '#minecraft:planks']) - - event.shaped('minecraft:crafting_table', [ - 'PP ', - 'PP ', - ' ' - ], { - P: '#minecraft:planks' - }) - - // Furnace - event.smelting('minecraft:iron_ingot', 'minecraft:iron_bars') - // Campfire - event.campfireCooking('minecraft:porkchop', 'minecraft:rotten_flesh') -}) - diff --git a/modpack/kubejs/startup_scripts/items.js b/modpack/kubejs/startup_scripts/items.js new file mode 100644 index 0000000..0b77fab --- /dev/null +++ b/modpack/kubejs/startup_scripts/items.js @@ -0,0 +1,8 @@ +// priority = 0 + +onEvent('item.registry', event => { + event.create('iron_plate').maxStackSize(16).displayName('Iron Plate') + event.create('iron_large_plate').maxStackSize(8).displayName('Large Iron Plate') + event.create('iron_long_plate').maxStackSize(16).displayName('Long Iron Plate') + event.create('iron_big_plate').maxStackSize(4).displayName('Big Iron Plate') +})