From 37da37131953306a08c7d1ec349d5757f8d021cf Mon Sep 17 00:00:00 2001 From: Steve McMaster Date: Tue, 13 Aug 2024 07:28:16 +0000 Subject: [PATCH] A couple server-side changes, NO UPDATE REQUIRED --- index.toml | 12 ++++++++++-- .../recipes/create/mixing/electrum_ingot.json | 1 + .../data/oreganized/recipes/electrum_ingot.json | 1 + kubejs/server_scripts/skapa.js | 15 +++++++++++++++ kubejs/startup_scripts/skapa.js | 3 ++- pack.toml | 2 +- 6 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 kubejs/data/oreganized/recipes/create/mixing/electrum_ingot.json create mode 100644 kubejs/data/oreganized/recipes/electrum_ingot.json diff --git a/index.toml b/index.toml index f27d3bc..e5b0b74 100644 --- a/index.toml +++ b/index.toml @@ -3760,6 +3760,14 @@ hash = "e7acc47fc8a16962c3a4949c4cc1982b65458840870baac88845767a67523b36" file = "kubejs/data/minecraft/tags/items/planks.json" hash = "33ac9ca332beb797112d9a90c4c560717ebae6ba282ec06a2fc36ebf022c3f20" +[[files]] +file = "kubejs/data/oreganized/recipes/create/mixing/electrum_ingot.json" +hash = "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a" + +[[files]] +file = "kubejs/data/oreganized/recipes/electrum_ingot.json" +hash = "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a" + [[files]] file = "kubejs/data/skapa/recipes/wither/compacting/molten_coal.json" hash = "bd8e803b1d226aa40066acce0b5e4d4750458a139658674d9b2b7bcc6f24cd05" @@ -3814,7 +3822,7 @@ hash = "6ed7c72b9e02059c86fe16f0d410f8fd89a4dfe4c40df4cd9d6f0ccd0862e60a" [[files]] file = "kubejs/server_scripts/skapa.js" -hash = "535b121d0c4d06a7533dc15388116d30cbe4ab2a152310319502416237036369" +hash = "ddabdf70c755e5de30d20aaec287586b7cf96852ce22ac31a4c1706bc85d4892" [[files]] file = "kubejs/server_scripts/soul_soil_farmland.js" @@ -3870,7 +3878,7 @@ hash = "39884208ba36c0b0363bb60895fe8010b0563ae3350c6bdd8f8a214c94e0e453" [[files]] file = "kubejs/startup_scripts/skapa.js" -hash = "ecdd0658474aa6780cba88ff2c443fc8d5336c547aeac94da55544b745d6ce26" +hash = "91478e57f5b30945015032c27f9a15d2960bff4804e36a414b9dc2dc4cd9fdf7" [[files]] file = "kubejs/startup_scripts/soul_soil_farmland.js" diff --git a/kubejs/data/oreganized/recipes/create/mixing/electrum_ingot.json b/kubejs/data/oreganized/recipes/create/mixing/electrum_ingot.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/kubejs/data/oreganized/recipes/create/mixing/electrum_ingot.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/kubejs/data/oreganized/recipes/electrum_ingot.json b/kubejs/data/oreganized/recipes/electrum_ingot.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/kubejs/data/oreganized/recipes/electrum_ingot.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/kubejs/server_scripts/skapa.js b/kubejs/server_scripts/skapa.js index 0d9fbb8..b5fab96 100644 --- a/kubejs/server_scripts/skapa.js +++ b/kubejs/server_scripts/skapa.js @@ -14,6 +14,21 @@ ServerEvents.recipes((event) => { } ) + event + .shaped( + Item.of('skapa:thermoelectric_generator', 1), + [ + 'III', + 'BLB', + 'BBB' + ], + { + 'I': { 'tag': 'forge:ingots/industrial_iron' }, + 'B': { 'tag': 'forge:ingots/brass' }, + 'L': { 'item': 'createaddition:gold_spool' } + } + ) + event .shaped( Item.of('skapa:thermoelectric_generator', 1), diff --git a/kubejs/startup_scripts/skapa.js b/kubejs/startup_scripts/skapa.js index effbc97..469311b 100644 --- a/kubejs/startup_scripts/skapa.js +++ b/kubejs/startup_scripts/skapa.js @@ -171,10 +171,11 @@ StartupEvents.registry('block', (event) => { event.create('skapa:thermoelectric_generator') .displayName('Thermoelectric Generator') - .hardness(30.0) + .hardness(15.0) .soundType('metal') .tagBlock('minecraft:mineable/pickaxe') .tagBlock('minecraft:needs_iron_tool') + .tagBlock('create:wrench_pickup') .requiresTool(true) .lightLevel(0) .blockEntity((info) => { diff --git a/pack.toml b/pack.toml index a53718c..3065555 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 = "af4cf83a620363dee3fb2e4b2dbf5c8856447a1d3fdec22d01639df5fb8654dc" +hash = "573f63ee77e243610d96d2a7fb9773fe28bbf7e9d6ce5e41c28d95ed03beceb1" [versions] forge = "47.3.5"