From 14c3a1c7640076e0ab99ae561be0dc9240434952 Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Sun, 15 Sep 2024 13:01:06 +0200 Subject: [PATCH] recipes & items --- web/pack/config/playerrevive.json | 70 +++++++++++++++++ web/pack/index.toml | 72 ++++++++++++++++-- .../kubejs/textures/item/andesite_bucket.png | Bin 0 -> 342 bytes .../kubejs/textures/item/andesite_shears.png | Bin 0 -> 329 bytes .../assets/kubejs/textures/item/blue_gem.png | Bin 0 -> 1216 bytes .../kubejs/textures/item/brass_shears.png | Bin 0 -> 303 bytes .../kubejs/textures/item/golden_potato.png | Bin 0 -> 333 bytes .../textures/item/incomplete_netherstar.png | Bin 0 -> 278 bytes .../textures/item/prismarine_shard_piece.png | Bin 0 -> 278 bytes .../assets/ponderjs_generated/lang/en_us.json | 1 + web/pack/kubejs/server_scripts/create.js | 24 ++++++ .../server_scripts/mechanical-extruder.js | 5 +- web/pack/kubejs/server_scripts/recipes.js | 19 +++++ web/pack/kubejs/server_scripts/sifter.js | 5 ++ web/pack/kubejs/startup_scripts/start.js | 34 +++++++++ web/pack/pack.toml | 2 +- 16 files changed, 221 insertions(+), 11 deletions(-) create mode 100644 web/pack/config/playerrevive.json create mode 100644 web/pack/kubejs/assets/kubejs/textures/item/andesite_bucket.png create mode 100644 web/pack/kubejs/assets/kubejs/textures/item/andesite_shears.png create mode 100644 web/pack/kubejs/assets/kubejs/textures/item/blue_gem.png create mode 100644 web/pack/kubejs/assets/kubejs/textures/item/brass_shears.png create mode 100644 web/pack/kubejs/assets/kubejs/textures/item/golden_potato.png create mode 100644 web/pack/kubejs/assets/kubejs/textures/item/incomplete_netherstar.png create mode 100644 web/pack/kubejs/assets/kubejs/textures/item/prismarine_shard_piece.png create mode 100644 web/pack/kubejs/assets/ponderjs_generated/lang/en_us.json create mode 100644 web/pack/kubejs/startup_scripts/start.js diff --git a/web/pack/config/playerrevive.json b/web/pack/config/playerrevive.json new file mode 100644 index 0000000..f591eb5 --- /dev/null +++ b/web/pack/config/playerrevive.json @@ -0,0 +1,70 @@ +{ + "banPlayerAfterDeath": false, + "bleeding": { + "bleedTime": 1200, + "triggerForCreative": true, + "bleedingMessage": true, + "bleedingMessageTrackingOnly": true, + "shouldGlow": false, + "bleedingEffects": [ + { + "effect": "minecraft:slowness", + "amplifier": 2, + "duration": 10, + "hideParticles": true + } + ], + "affectHunger": true, + "remainingHunger": 6, + "initialDamageCooldown": 10, + "bleedingHealth": 10, + "disableMobDamage": true, + "disablePlayerDamage": false, + "disableOtherDamage": false, + "hasShaderEffect": false, + "changePermissionLevel": false, + "permissionLevel": 0, + "canBePushed": true + }, + "revive": { + "requiredReviveProgress": 100.0, + "progressPerPlayer": 1.0, + "exhaustion": 0.5, + "haltBleedTime": true, + "abortOnDamage": false, + "resetProgress": false, + "revivedEffects": [ + { + "effect": "minecraft:slowness", + "amplifier": 2, + "duration": 1, + "hideParticles": true + } + ], + "reviveItem": "{id:\"item\",item:\"minecraft:paper\"}", + "needReviveItem": false, + "consumeReviveItem": false, + "maxDistance": 3, + "healthAfter": 4 + }, + "sounds": { + "death": { + "sound": "playerrevive:death", + "volume": 1.0, + "pitch": 1.0 + }, + "revived": { + "sound": "playerrevive:revived", + "volume": 1.0, + "pitch": 1.0 + } + }, + "bypassDamageSources": [ + "gorgon", + "death.attack.sgcraft:transient", + "death.attack.sgcraft:iris", + "vampirism_dbno", + "hordes:infection" + ], + "bleedInSingleplayer": false +} \ No newline at end of file diff --git a/web/pack/index.toml b/web/pack/index.toml index 8169b37..872adb1 100644 --- a/web/pack/index.toml +++ b/web/pack/index.toml @@ -13,28 +13,84 @@ file = "config/create_jetpack-client.toml" hash = "c1cd167bafe6cb67d191037edef9e79f9a089675b2d7c2bfe6513c9fb2418022" [[files]] -file = "config/resourcepackoverrides.json" -hash = "a3cf7e1881e8af5e46114ed9b8c3c35018abbc24465a555a5d486beb32e8f525" +file = "config/defaultoptions/keybindings.txt" +hash = "acb8482ccd589efa527d15f86d8c34bf601820dde454f6df07160bc082fc62de" [[files]] -file = "config/waystones-common.toml" -hash = "d5c2644af8e377c6bb1c8be6337d19cdbc32ccb9358a2a6a6a7284fe39b6f591" +file = "config/defaultoptions/options.txt" +hash = "34219fe116137571331429b505f8ed79d8fb7f0b6ff95b68257e7232645dea7a" + +[[files]] +file = "config/defaultoptions/servers.dat" +hash = "c61a43e3b91c0b05f54e62c3e88a107dc1dcac2dab02da11e0487ecc137f55ea" + +[[files]] +file = "config/emotecraft.json" +hash = "47c5e2ac05037b4349ab6d0f59b28eb4b98e357692ae0649144e93fffa884f85" + +[[files]] +file = "config/playerrevive.json" +hash = "116322eba8ee862248eb55b54bd4df9665195d56d43d6a3af29671e1fc73cb0d" + +[[files]] +file = "config/resourcepackoverrides.json" +hash = "58db440d1748c113a4ca18b5a208337a76518d5a6f12f33cb0c75b5f8b31e6df" + +[[files]] +file = "defaultconfigs/ftbchunks/client-config.snbt" +hash = "85ce818a389e5c79dac67bf0737987a06221ab1fd3d007570ef3e5c9f8b125b6" + +[[files]] +file = "kubejs/assets/kubejs/textures/item/andesite_bucket.png" +hash = "f661de45f6c47621e5022c9077a042b5fa365853e4d4f5ab2d2c4873b219457e" + +[[files]] +file = "kubejs/assets/kubejs/textures/item/andesite_shears.png" +hash = "aa0bfabe03346324e6b3702614f460d7ff4ddd142e3cb2d55d85ada1cc57b9ca" + +[[files]] +file = "kubejs/assets/kubejs/textures/item/blue_gem.png" +hash = "081e96c90820121fc79a338228e92ac19c05e42fe02399c03dc1f00fa2d17a4c" + +[[files]] +file = "kubejs/assets/kubejs/textures/item/brass_shears.png" +hash = "ceca111ad02c55e61af6ed8fc097d3f6fb5883a5b326b4d07acd3da08e7cbb2e" + +[[files]] +file = "kubejs/assets/kubejs/textures/item/golden_potato.png" +hash = "ed5fbd990950848386c39111f28aeaa5bd82ec4bc1e017236bcc43fbbe2c3c15" + +[[files]] +file = "kubejs/assets/kubejs/textures/item/incomplete_netherstar.png" +hash = "dfd8431f704215f19a2af708563264eb542c98c31cf78f2c8c32f70fccbbb838" + +[[files]] +file = "kubejs/assets/kubejs/textures/item/prismarine_shard_piece.png" +hash = "dfd8431f704215f19a2af708563264eb542c98c31cf78f2c8c32f70fccbbb838" + +[[files]] +file = "kubejs/assets/ponderjs_generated/lang/en_us.json" +hash = "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a" [[files]] file = "kubejs/server_scripts/create.js" -hash = "962e0a0008230241f063973f596f8063544f38bb2e8267c21aa5358bdc24d81b" +hash = "9cb1dccedcfb48aef599bbc6b1b8b21772393161d93fb5fa7a06dcbbcb5b5156" [[files]] file = "kubejs/server_scripts/mechanical-extruder.js" -hash = "d9af3dc6884dcc637097b598a09776a2b6fdc6a0e6f644d643add671f4140da8" +hash = "da639e7a170a53d814daa3a14f55b0ac6d2fc153790cd2544cce94f3af46ec6d" [[files]] file = "kubejs/server_scripts/recipes.js" -hash = "0c82252bcf1e2b4c165ad82b1eee3013f7c5c26419c1fd80d0acf55a20cf6927" +hash = "4efcb883ac6cd22e497b00b99aca5d9dc2515436fc049da28c820042e854d05c" [[files]] file = "kubejs/server_scripts/sifter.js" -hash = "153cfea188512825e2bb44fa71196a023940019762698f26cf7290dedbe351d5" +hash = "85783106932b38e689485c49aa0162bd37d8dbc61564a70bc643ef3cb9750eec" + +[[files]] +file = "kubejs/startup_scripts/start.js" +hash = "7b72e3568f8ec48f7d9c18432be68b385ad9cdc7cdb23c5fa555dc39e7aaad93" [[files]] file = "mods/advancement-plaques.pw.toml" diff --git a/web/pack/kubejs/assets/kubejs/textures/item/andesite_bucket.png b/web/pack/kubejs/assets/kubejs/textures/item/andesite_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..efcb0d4aae37c2b303c3e9fc12e3537e34b724e0 GIT binary patch literal 342 zcmV-c0jd6pP)Px$5J^NqR5*>TlQC<;P!xqfLuZkUEoz#FmNTW8+B6KY2AbI4PP+Ij&?;Y;@?s=E@;7BFn%zUZn$NA&_Fj6lJ%d&ic@?Dv$ z!j1CJ(-#2LtF;J7E%K$JU#Z*z;5rL+*f6tdox9ADxi+a+YYK7}PT)EVHruV*r;OV literal 0 HcmV?d00001 diff --git a/web/pack/kubejs/assets/kubejs/textures/item/andesite_shears.png b/web/pack/kubejs/assets/kubejs/textures/item/andesite_shears.png new file mode 100644 index 0000000000000000000000000000000000000000..36489aacd7180b161a183d95b859c3f989b7cc2c GIT binary patch literal 329 zcmV-P0k-~$P)Px$14%?dR5*>z&^<~6K^VsI{{|~l2mwJtY_f>~i-jePwXKcf0aUy|8c&fX7ZCIk zHX?`~Ae9i=%{WQ6SO}!EvDnvYhAgumr9S1%`+MhM;IHG=4cwdsA_pPeULODzM?Bm= zTGyzB|mLR^7@ z%KQGCmcCKTeaqmmbN;vgKu|pWKZ9o3>G%H^7XJq-7zLvtFkC~x%k7UoFkdi~1o;Is zfYLq$3|H^s^_M_EeiKkZlBbJfh{V*~zG$HX3LMOgog(k*A0)Z{p7AWde1^cH`x`uh zYYnQ7^&M?`_bx4J*}=Ag%bAnb>MhGmdvNjM_J$|ZIr@YqD5|)IbaHsDF+amFqmuvR n)TrLmJvPhYpB;7i_0U><(kG@FjOVU_$|nX-S3j3^P6o?yklKtP{-tlwLkgNzW4AfRD&&m0A7U*dPPgg&ebxsLQ0K=SuivR!s literal 0 HcmV?d00001 diff --git a/web/pack/kubejs/assets/kubejs/textures/item/golden_potato.png b/web/pack/kubejs/assets/kubejs/textures/item/golden_potato.png new file mode 100644 index 0000000000000000000000000000000000000000..55d1a9ec0b33d02f46f172a2799983bf30750b64 GIT binary patch literal 333 zcmV-T0kZyyP)Px$2T4RhR5*?8k+Dv~P!xtgZ%BxZiGkn~u#`kMCO{WwP6PLkHTniqrb(BQluWA?Uhs zPOVu*``&iY)p6P+lb~&@*uKBy;_H)IvkHK9b;oiwK}`d+@A1;rk|ehacLujaj7|iB* z0T$(!^l$xlDmO}C#|;?`<8_{plaKM~6X%m$u=ZntwfwK#*7(CD~TBhRwqK$=~fJX2};OOioS!f{NcC zMVk%wOB_BnS>1pq@!+zX=TGvv`pk&$d3bEGJI{9ixd%7&aL!yjUEq)W%>UmWYg_#O zb-DV6O!rHsln=ii^RuzFh4ZYp|Cdlv@KNn>tL18gJw1<_yt%I#?W_ABvT9FW}<%C2UdF198$<>`}#c2>Ky6^)KwH|m?GZ1~?2%2&z2 Zp!dpeQrXRuhk<@$@O1TaS?83{1ORF_cFh0) literal 0 HcmV?d00001 diff --git a/web/pack/kubejs/assets/kubejs/textures/item/prismarine_shard_piece.png b/web/pack/kubejs/assets/kubejs/textures/item/prismarine_shard_piece.png new file mode 100644 index 0000000000000000000000000000000000000000..612607d6984ca2e8c38f874404d016539a8a033a GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|E_k{)hFJ6_ zCrGgN>`<8_{plaKM~6X%m$u=ZntwfwK#*7(CD~TBhRwqK$=~fJX2};OOioS!f{NcC zMVk%wOB_BnS>1pq@!+zX=TGvv`pk&$d3bEGJI{9ixd%7&aL!yjUEq)W%>UmWYg_#O zb-DV6O!rHsln=ii^RuzFh4ZYp|Cdlv@KNn>tL18gJw1<_yt%I#?W_ABvT9FW}<%C2UdF198$<>`}#c2>Ky6^)KwH|m?GZ1~?2%2&z2 Zp!dpeQrXRuhk<@$@O1TaS?83{1ORF_cFh0) literal 0 HcmV?d00001 diff --git a/web/pack/kubejs/assets/ponderjs_generated/lang/en_us.json b/web/pack/kubejs/assets/ponderjs_generated/lang/en_us.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/web/pack/kubejs/assets/ponderjs_generated/lang/en_us.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/web/pack/kubejs/server_scripts/create.js b/web/pack/kubejs/server_scripts/create.js index 25e3571..622e480 100644 --- a/web/pack/kubejs/server_scripts/create.js +++ b/web/pack/kubejs/server_scripts/create.js @@ -6,4 +6,28 @@ ServerEvents.recipes(event => { event.recipes.create.mixing(['minecraft:obsidian'], [Fluid.water(1000), Fluid.lava(1000)]) + + + let inter = 'kubejs:incomplete_netherstar' // making a variable to store the transitional item makes the code more readable + event.recipes.create.sequenced_assembly([ + Item.of('nether_star'), // this is the item that will appear in JEI as the result + ], 'prismarine_shard', [ // 'flowering_azalea_leaves' is the input + // the transitional item is a variable, that is 'kubejs:incomplete_spore_blossom' and is used during the intermediate stages of the assembly + event.recipes.createPressing(inter, inter), + // like a normal recipe function, is used as a sequence step in this array. Input and output have the transitional item + event.recipes.createFilling(inter, [inter, Fluid.water(420)]), + event.recipes.createPressing(inter, inter), + event.recipes.createFilling(inter, [inter, Fluid.of('create_enchantment_industry:experience', 250)]), + ]).transitionalItem(inter).loops(8) // set the transitional item and the number of loops + + let interPainting = 'minecraft:painting' // making a variable to store the transitional item makes the code more readable + event.recipes.create.sequenced_assembly([ + Item.of('dimpaintings:end_painting'), // this is the item that will appear in JEI as the result + ], interPainting, [ // 'flowering_azalea_leaves' is the input + // the transitional item is a variable, that is 'kubejs:incomplete_spore_blossom' and is used during the intermediate stages of the assembly + event.recipes.createPressing(inter, inter), + event.recipes.createPressing(inter, inter), + // like a normal recipe function, is used as a sequence step in this array. Input and output have the transitional item + event.recipes.createFilling(inter, [inter, Fluid.of('create_enchantment_industry:experience', 1000)]), + ]).transitionalItem(inter).loops(1) // set the transitional item and the number of loops }) \ No newline at end of file diff --git a/web/pack/kubejs/server_scripts/mechanical-extruder.js b/web/pack/kubejs/server_scripts/mechanical-extruder.js index 08c4cea..d124f34 100644 --- a/web/pack/kubejs/server_scripts/mechanical-extruder.js +++ b/web/pack/kubejs/server_scripts/mechanical-extruder.js @@ -19,7 +19,7 @@ ServerEvents.recipes((event) => { event.recipes .createMechanicalExtruderExtruding(Item.of("minecraft:netherrack"), [ Item.of("minecraft:blue_ice"), - Fluid.of("minecraft:water"), + Fluid.of("minecraft:lava"), ]) .biome("minecraft:is_nether") .withCatalyst("minecraft:netherrack"); @@ -34,6 +34,7 @@ ServerEvents.recipes((event) => { Fluid.of("minecraft:lava"), Fluid.of("minecraft:water"), ]) + .max_height(1) .withCatalyst("minecraft:deepslate"); event.recipes @@ -41,7 +42,7 @@ ServerEvents.recipes((event) => { Item.of("minecraft:blue_ice"), Fluid.of("minecraft:lava"), ]) - .withCatalyst("minecraft:diamond_block"); + .withCatalyst("minecraft:obsidian"); event.recipes .createMechanicalExtruderExtruding(Item.of("minecraft:soul_soil"), [ diff --git a/web/pack/kubejs/server_scripts/recipes.js b/web/pack/kubejs/server_scripts/recipes.js index 2a6dbd9..ac7dd84 100644 --- a/web/pack/kubejs/server_scripts/recipes.js +++ b/web/pack/kubejs/server_scripts/recipes.js @@ -14,6 +14,18 @@ ServerEvents.recipes(event => { I: 'create:brass_ingot' } ) + + event.shaped('minecraft:elytra', [// arg 1: output + 'CDC', + 'MNM', // arg 2: the shape (array of strings) + 'M M' + ], { + C: 'minecraft:chorus_fruit', + N: 'minecraft:nether_star', + M: 'minecraft:phantom_membrane', //arg 3: the mapping object + D: 'minecraft:diamond', //arg 3: the mapping object + } + ) //SHAPELESS event.shapeless('minecraft:blaze_rod', [ // arg 1: output '6x minecraft:blaze_powder' @@ -31,4 +43,11 @@ event.smelting('6x minecraft:blaze_powder', 'minecraft:blaze_rod') // Burn sticks into torches on the Campfire: //event.campfireCooking('minecraft:leather', 'minecraft:rotten_flesh') +event.recipes.melterMelting(Fluid.of('minecraft:lava', 1000),"minecraft:obsidian").processingTime(200); +event.recipes.melterMelting(Fluid.of('create:honey', 1000),"minecraft:honey_block").processingTime(200); +event.recipes.melterMelting(Fluid.of('minecraft:lava', 500),"#forge:stone").processingTime(200); + +event.remove({ output: 'dimpaintings:end_painting' }) + + }) \ No newline at end of file diff --git a/web/pack/kubejs/server_scripts/sifter.js b/web/pack/kubejs/server_scripts/sifter.js index 6601ad5..d07401b 100644 --- a/web/pack/kubejs/server_scripts/sifter.js +++ b/web/pack/kubejs/server_scripts/sifter.js @@ -15,6 +15,11 @@ ServerEvents.recipes(event => { //listen for the "recipes" server event. event.recipes.createsifterSifting([Item.of('resource_cracker:nugget_diamond').withChance(0.2),Item.of('resource_cracker:nugget_emerald').withChance(0.1),Item.of('minecraft:netherite_scrap').withChance(0.01)], ['minecraft:basalt','createsifter:brass_mesh']) event.recipes.createsifterSifting([Item.of('resource_cracker:nugget_diamond').withChance(0.5),Item.of('resource_cracker:nugget_emerald').withChance(0.4),Item.of('minecraft:netherite_scrap').withChance(0.1)], ['minecraft:basalt','createsifter:advanced_brass_mesh']) + + + event.recipes.createsifterSifting([Item.of('minecraft:cocoa_beans').withChance(0.1),Item.of('minecraft:red_mushroom').withChance(0.1),Item.of('minecraft:brown_mushroom').withChance(0.1)], ['minecraft:dirt','createsifter:brass_mesh']) + + event.recipes.createsifterSifting([Item.of('minecraft:prismarine_shard').withChance(0.3)], ['minecraft:sand','createsifter:brass_mesh']).waterlogged() //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/kubejs/startup_scripts/start.js b/web/pack/kubejs/startup_scripts/start.js new file mode 100644 index 0000000..9c2d1eb --- /dev/null +++ b/web/pack/kubejs/startup_scripts/start.js @@ -0,0 +1,34 @@ +StartupEvents.registry('item', e => { + e.create('incomplete_netherstar', 'create:sequenced_assembly') + + e.create('andesite_shears', 'shears') + .displayName("Andesite Shears") + .maxDamage(127) + + e.create('brass_shears', 'shears') + .displayName("Brass Shears") + .maxDamage(450) + + e.create('golde_potato').food(food => { + food + .hunger(18) + .saturation(18)//This value does not directly translate to saturation points gained + //The real value can be assumed to be: + //min(hunger * saturation * 2 + saturation, foodAmountAfterEating) + .effect('speed', 600, 0, 1) + .removeEffect('poison') + .alwaysEdible()//Like golden apples + .fastToEat()//Like dried kelp + .meat()//Dogs are willing to eat it + .eaten(ctx => {//runs code upon consumption + ctx.player.tell(Text.gold('Yummy Yummy!')) + //If you want to modify this code then you need to restart the game. + //However, if you make this code call a global startup function + //and place the function *outside* of an event handler + //then you may use the command: + // /kubejs reload startup_scripts + //to reload the function instantly. + //See example below + }) + }) +}) \ No newline at end of file diff --git a/web/pack/pack.toml b/web/pack/pack.toml index ad8d1e4..f3bc72e 100644 --- a/web/pack/pack.toml +++ b/web/pack/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "78c97eed9f3a083d0806c65f47b21162b856134bc53fc8ada4e1e4969b4d5a67" +hash = "4d49f5590ef178a4b3d8534ad5408c49bb4fe345a5e99fdaa499a3af42655edc" [versions] forge = "47.3.7"