diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index c8daeb95..c93aceef 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -9,6 +9,7 @@ body: **Prior to filling out this bug report, please make sure of the following:** - You tried on the latest version of the pack. - You don't have any other mods installed. + - You checked the previous issues to see if it's not a duplicate. - type: dropdown id: fixes attributes: @@ -19,12 +20,17 @@ body: - "No" validations: required: true - - type: input + - type: dropdown id: pack-version attributes: label: Modpack Version description: What version of the pack are you using? - placeholder: ex. 1.8.4 + options: + - 1.8.5 + - 1.8.4 + - 1.8.3 + - 1.7.11 + - other validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/crash.yaml b/.github/ISSUE_TEMPLATE/crash.yaml index 8dd79071..d92b4a67 100644 --- a/.github/ISSUE_TEMPLATE/crash.yaml +++ b/.github/ISSUE_TEMPLATE/crash.yaml @@ -19,12 +19,17 @@ body: - "No" validations: required: true - - type: input + - type: dropdown id: pack-version attributes: label: Modpack Version description: What version of the pack are you using? - placeholder: ex. 1.8.4 + options: + - 1.8.5 + - 1.8.4 + - 1.8.3 + - 1.7.11 + - other validations: required: true - type: textarea @@ -38,8 +43,8 @@ body: - type: input id: logs attributes: - label: latest.log - description: Please upload your 'latest.log' file to https://gist.github.com/ and leave the link here. + label: Crash Log + description: Please upload your crash log to https://gist.github.com/ and leave the link here. placeholder: https://gist.github.com/ validations: required: true diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index 2a29f801..266e5592 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -8,5 +8,4 @@ [packversionmin] minor = 8 [packversionminrev] - minorrev = 4 - + minorrev = 5 diff --git a/config/ftbquests/quests/chapters/creative.snbt b/config/ftbquests/quests/chapters/creative.snbt index 45a5b4b3..076aa4e2 100644 --- a/config/ftbquests/quests/chapters/creative.snbt +++ b/config/ftbquests/quests/chapters/creative.snbt @@ -9,11 +9,10 @@ default_hide_dependency_lines: false quests: [ { - title: "Resourceful Bees" + title: "Creative Apiary" x: -1.5d y: -1.5d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "695EEC6AEF550449" tasks: [ { @@ -36,10 +35,8 @@ { title: "Create" x: -0.5d - y: -3.0d - description: ["Infinite RPM out of nothing :O"] + y: -3.0d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "2CF11A70229000AB" tasks: [ { @@ -57,9 +54,7 @@ { x: 1.5d y: 3.0d - description: ["Nearly infinite Storage"] hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "546D0730D780D30B" tasks: [{ id: "6A69B872FEC84F2C" @@ -251,7 +246,6 @@ "She will only produce 1 comb item, no matter what apiary or hive you're using. Centrifuge multipliers also do not work on the combs." ] hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "5C010374A550B53F" tasks: [ { @@ -315,97 +309,60 @@ { x: -1.0d y: 0.0d - id: "5B677F41E5A12166" + id: "314537C71B1B5741" tasks: [{ - id: "32115EB5F6198E0A" + id: "4F7E4F430154E96E" type: "item" item: "mysticalagradditions:creative_essence" }] - rewards: [{ - id: "51E7B49C797D47B5" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: -2.0d y: 0.5d - id: "3FCB14EFFBAF0C9B" + id: "088E6EA318D25659" tasks: [{ - id: "3183D4DEAB2C4F3E" + id: "48CC30220D7FC2C9" type: "item" item: "atmadditions:nexium_emitter" }] - rewards: [{ - id: "0941901F4B5EE1C4" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: -2.5d y: 1.5d - id: "7633927107252797" + id: "29FFA090ADB56195" tasks: [{ - id: "27348FEF99D8CB45" + id: "3F1E9259BB90D044" type: "item" item: "atmadditions:philosophers_fuel" }] - rewards: [{ - id: "669C3B858C7D2814" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: -2.0d y: 2.5d - id: "4B6F6458B290F3FF" + id: "296E89E2DF857B25" tasks: [{ - id: "323C73CE2E9A8EAA" + id: "56F3DEFF2D46B881" type: "item" item: "atmadditions:pulsating_black_hole" }] - rewards: [{ - id: "7D12D645F5CB2813" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: -1.0d y: 3.0d - id: "7A2C6D2BF3FF5B8A" + id: "794EC696A3B7DAC3" tasks: [{ - id: "03EF1A2F1062529D" + id: "10834451DAC877C5" type: "item" item: "atmadditions:dimensional_seed" }] - rewards: [{ - id: "79E9954DA4DE4282" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: 0.0d y: 0.0d description: ["Needed for crafting OP creative items"] - dependencies: [ - "3DDF486DEE908A20" - "4548B0E30DCD59A4" - "7633927107252797" - "5B677F41E5A12166" - "3FCB14EFFBAF0C9B" - "4B6F6458B290F3FF" - "26175CD0F21263E4" - "7A2C6D2BF3FF5B8A" - "2C6B3E47676E62A4" - "1EAB4A302BC29CAF" - ] - id: "257064EF9D295744" + id: "464D0C17601E8A2B" tasks: [{ - id: "1805981EC03970F2" + id: "5F6988D125AAB233" type: "item" item: "atmadditions:atm_star" }] @@ -413,69 +370,49 @@ { x: 1.0d y: 0.0d - id: "4548B0E30DCD59A4" + id: "24CE3AF373180CC9" tasks: [{ - id: "020B201E582AC647" + id: "7222BF35C9281295" type: "item" item: "kubejs:patrick_star" }] - rewards: [{ - id: "12CAAD4E3A41127F" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: 2.0d y: -0.5d - id: "26175CD0F21263E4" + id: "20408CB5A15237EA" tasks: [{ - id: "25ABCDE2203D6C94" + id: "64A1AE71DDC8F0B0" type: "item" item: "atmadditions:oblivion_shard" }] - rewards: [{ - id: "388D90F741B5B0F8" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: 2.5d y: -1.5d - id: "2C6B3E47676E62A4" + id: "4A629299C15E7E81" tasks: [{ - id: "668FDE92D3C3CF31" + id: "52DDA8A874F605CB" type: "item" item: "atmadditions:improbable_probability_device" }] - rewards: [{ - id: "6C15B7FBA87B96D9" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: 2.0d y: -2.5d - id: "3DDF486DEE908A20" + id: "3615BAFD4F2AD479" tasks: [{ - id: "04BC676867D17C75" + id: "48CE28F5C1683093" type: "item" item: "atmadditions:dragon_soul" }] - rewards: [{ - id: "5F008E41DD00B16F" - type: "item" - item: "pamhc2foodextended:brownieitem" - }] } { x: 1.0d y: -3.0d - id: "1EAB4A302BC29CAF" + id: "5477FBAEBDE2D10B" tasks: [{ - id: "02762484FB7BE47F" + id: "042808E2D5E02DED" type: "item" item: "atmadditions:withers_compass" }] @@ -485,7 +422,6 @@ x: 2.5d y: 1.5d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "436B5A79FA72DB1A" tasks: [ { @@ -531,7 +467,6 @@ x: 0.5d y: 1.5d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "5C7B81756CA58056" tasks: [ { @@ -552,19 +487,12 @@ } } ] - rewards: [{ - id: "0426E9AD4B1EC5B8" - type: "item" - item: "botania:gaia_ingot" - count: 10 - }] } { title: "Ars Nouveau" x: 1.5d y: 1.5d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "6FB82574D7AE6D85" tasks: [ { @@ -584,7 +512,6 @@ x: -2.5d y: -1.5d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "13E4B8DECD54CFE1" tasks: [ { @@ -604,7 +531,6 @@ x: -1.5d y: -3.0d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "0A5EE5CAA2CC572E" tasks: [{ id: "3C71DA673A75CBAA" @@ -613,10 +539,10 @@ }] } { + title: "Ice and Fire" x: -2.5d y: -3.0d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "7DB018F46584386C" tasks: [ { @@ -645,7 +571,6 @@ x: 2.5d y: 3.0d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "22C55C94E18D5073" tasks: [{ id: "65EAD2FC01537F02" @@ -657,7 +582,6 @@ x: 0.5d y: 3.0d hide_dependency_lines: true - dependencies: ["257064EF9D295744"] id: "54F43B991F8ADB0F" tasks: [{ id: "1446F1B10FD2814E" @@ -699,5 +623,35 @@ item: "allthecompressed:atm_star_block_9x" }] } + { + x: 1.0d + y: -1.5d + description: [ + "To get the Shards, you will have to build a 4 block tall structure as such:" + "The bottom block is Bedrock, above it an Anvil with an Item Frame on top. Hovering over the Item Frame, place Mjollnir." + "Once you have the structure, place your ATM Star in the item frame and click the hammer." + "{image:modpack:textures/atm_shard_bonk.png width:100 height:200 align:1}" + ] + hide_dependency_lines: true + dependencies: ["464D0C17601E8A2B"] + id: "3A6E437A6D0C634D" + tasks: [{ + id: "7185D1288C51896F" + type: "item" + item: "atmadditions:atm_star_shard" + }] + } + { + x: -1.0d + y: 1.5d + hide_dependency_lines: true + dependencies: ["3A6E437A6D0C634D"] + id: "435F4E14490CBE2B" + tasks: [{ + id: "6E417FA286B2F2BF" + type: "item" + item: "atmadditions:allthecatalystium" + }] + } ] } diff --git a/config/ftbquests/quests/chapters/resourceful_bees.snbt b/config/ftbquests/quests/chapters/resourceful_bees.snbt index 9a2f180e..70b6c978 100644 --- a/config/ftbquests/quests/chapters/resourceful_bees.snbt +++ b/config/ftbquests/quests/chapters/resourceful_bees.snbt @@ -4651,7 +4651,7 @@ "One of the most interesting features of Resourceful Bees is mutation. It lets you turn blocks, items, and other mobs into others using bees." "Mutations happen when a bee with polen flies over a mutatable block or entity." "Below is a setup to mutate blocks using a bee going back and forth." - "{image:modpack:textures/block_mutation.png width:192 height:108 align:1}" + "{image:allthemods:textures/block_mutation.png width:192 height:108 align:1}" ] hide_dependency_lines: true dependencies: ["288A0D740ECD12F1"] @@ -4728,7 +4728,7 @@ description: [ "You can mutate certain bees into other bees." "Below is an example setup." - "{image:modpack:textures/entity_mutation.png width:192 height:108 align:1 fit:true}" + "{image:allthemods:textures/entity_mutation.png width:192 height:108 align:1 fit:true}" ] dependencies: ["1C97E085F7F6CFF3"] id: "75F070F3C448F38E" diff --git a/config/perpetual_durability-common.toml b/config/perpetual_durability-common.toml new file mode 100644 index 00000000..23529208 --- /dev/null +++ b/config/perpetual_durability-common.toml @@ -0,0 +1,3 @@ +[enchantments] + [enchantments.perpetual] + enchantItem = "allthemodium:unobtainium_ingot" diff --git a/config/resourcefulbees/bees/natural/bees_misc/Cotton_Candy.json b/config/resourcefulbees/bees/natural/bees_misc/Cotton_Candy.json new file mode 100644 index 00000000..df64ae40 --- /dev/null +++ b/config/resourcefulbees/bees/natural/bees_misc/Cotton_Candy.json @@ -0,0 +1,85 @@ +{ + "flower": "thermal:sugar_cane_block", + "maxTimeInHive": 1200, + "traits": [], + "creator": "NoControl, Dawn Felstar", + "lore": "Not because I want to be different, but because I want to be myself.", + "loreColor": "#F7A8B8", + "hasHoneycomb": true, + "baseLayerTexture" : "misc/cotton_candy_bee", + "ColorData": { + "isBeeColored": false, + "modelType" : "CROP", + "honeycombColor": "#55CDFC" + }, + "CombatData": { + "isPassive": true, + "removeStingerOnAttack": false, + "inflictsPoison": false, + "attackDamage": 1 + }, + "MutationData": { + "hasMutation": true, + "mutationCount": 1, + "mutations": [ + { + "type": "BLOCK_TO_ITEM", + "inputID": "resourcefulbees:cotton_candy_honeycomb_block", + "outputs": [ + { + "outputID": "pamhc2foodcore:cottoncandyitem", + "weight": 80 + }, + { + "outputID": "resourcefulbees:bee_jar", + "nbtData": { + "Entity": "resourcefulbees:cotton_candy_bee", + "BeeType": "cotton_candy", + "Color": "#55CDFC" + }, + "weight": 20 + } + ] + } + ] + }, + "CentrifugeData": { + "hasCentrifugeOutput": true, + "mainInputCount": 4, + "mainOutput": "pamhc2foodcore:cottoncandyitem", + "mainOutputWeight": 0.20, + "mainOutputCount": 1, + "secondaryOutput": "minecraft:sugar", + "secondaryOutputWeight": 0.20, + "secondaryOutputCount": 1, + "bottleOutput": "minecraft:honey_bottle", + "bottleOutputWeight": 0.25, + "bottleOutputCount": 1, + "recipeTime": 200 + }, + "SpawnData": { + "canSpawnInWorld": true, + "biomeWhitelist": "byg:pumpkin_forest", + "biomeBlacklist": "", + "spawnWeight": 5, + "minYLevel": 0, + "maxYLevel": 255, + "minGroupSize": 1, + "maxGroupSize": 2, + "lightLevel": "ANY" + }, + "BreedData": { + "isBreedable": true, + "parent1": "", + "parent2": "", + "breedWeight": 10, + "breedChance": 0.8, + "feedItem": "pamhc2foodcore:cottoncandyitem", + "feedAmount": 5, + "childGrowthDelay": -24000, + "breedDelay": 6000 + }, + "TraitData": { + "hasTraits": false + } +} \ No newline at end of file diff --git a/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json b/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json index 9c4caa11..6d59b3dd 100644 --- a/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json +++ b/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json @@ -407,10 +407,15 @@ "item.resourcefulbees.chaotic_bee_spawn_egg": "Chaotic Bee Spawn Egg", "entity.resourcefulbees.chaotic_bee": "Chaotic Bee", + "block.resourcefulbees.cotton_candy_honeycomb_block": "Cotton Candy Honeycomb Block", + "item.resourcefulbees.cotton_candy_honeycomb": "Cotton Candy Honeycomb", + "item.resourcefulbees.cotton_candy_bee_spawn_egg": "Cotton Candy Bee Spawn Egg", + "entity.resourcefulbees.cotton_candy_bee": "Cotton Candy Bee", + "trait.resourcefulbees.draconic": "Draconic Trait", "trait.resourcefulbees.awakened": "Awakened Trait", "trait.resourcefulbees.chaotic": "Chaotic Trait", "trait.resourcefulbees.soul_fire": "Soul Fire Trait", "trait.resourcefulbees.starry": "Starry Night Trait", "trait.resourcefulbees.beediddy": "Beediddy Trait" -} \ No newline at end of file +} diff --git a/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/cotton_candy_bee.png b/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/cotton_candy_bee.png new file mode 100644 index 00000000..6dcfdaad Binary files /dev/null and b/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/cotton_candy_bee.png differ diff --git a/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/cotton_candy_bee_angry.png b/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/cotton_candy_bee_angry.png new file mode 100644 index 00000000..983c20f9 Binary files /dev/null and b/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/cotton_candy_bee_angry.png differ diff --git a/config/titanium/titanium-tags.toml b/config/titanium/titanium-tags.toml new file mode 100644 index 00000000..2ff10bf1 --- /dev/null +++ b/config/titanium/titanium-tags.toml @@ -0,0 +1,2 @@ +[TagConfig] + ITEM_PREFERENCE = ["minecraft", "alltheores", "thermal", "immersiveengineering", "create", "mekanism", "jaopca", "kubejs", "appliedenergistics2", "pneumaticcraft", "occultism", "tmechworks", "industrialforegoing", "botania", "quark", "pedestals"] diff --git a/defaultconfigs/create-server.toml b/defaultconfigs/create-server.toml new file mode 100644 index 00000000..b6cdad9c --- /dev/null +++ b/defaultconfigs/create-server.toml @@ -0,0 +1,6 @@ +[recipes] + bulkPressing = true + bulkCutting = true +[fluids] + fluidTankCapacity = 64 + hosePulleyBlockThreshold = -1 diff --git a/defaultconfigs/solcarrot-server.toml b/defaultconfigs/solcarrot-server.toml index 7d43eace..e44bebd3 100644 --- a/defaultconfigs/solcarrot-server.toml +++ b/defaultconfigs/solcarrot-server.toml @@ -1,6 +1,5 @@ - [milestones] heartsPerMilestone = 1 - milestones = [5, 10, 15, 20, 25] + milestones = [5, 10, 15, 20, 25, 30, 35, 40, 45, 50] [miscellaneous] resetOnDeath = false diff --git a/kubejs/assets/allthemods/ponder/creative_cube.nbt b/kubejs/assets/allthemods/ponder/creative_cube.nbt new file mode 100644 index 00000000..dbacb76a Binary files /dev/null and b/kubejs/assets/allthemods/ponder/creative_cube.nbt differ diff --git a/kubejs/assets/allthemods/ponder/shard_bonk.nbt b/kubejs/assets/allthemods/ponder/shard_bonk.nbt new file mode 100644 index 00000000..c429209a Binary files /dev/null and b/kubejs/assets/allthemods/ponder/shard_bonk.nbt differ diff --git a/kubejs/assets/modpack/textures/atm_shard_bonk.png b/kubejs/assets/allthemods/textures/atm_shard_bonk.png similarity index 100% rename from kubejs/assets/modpack/textures/atm_shard_bonk.png rename to kubejs/assets/allthemods/textures/atm_shard_bonk.png diff --git a/kubejs/assets/modpack/textures/block_mutation.png b/kubejs/assets/allthemods/textures/block_mutation.png similarity index 100% rename from kubejs/assets/modpack/textures/block_mutation.png rename to kubejs/assets/allthemods/textures/block_mutation.png diff --git a/kubejs/assets/modpack/textures/entity_mutation.png b/kubejs/assets/allthemods/textures/entity_mutation.png similarity index 100% rename from kubejs/assets/modpack/textures/entity_mutation.png rename to kubejs/assets/allthemods/textures/entity_mutation.png diff --git a/kubejs/assets/kubejs/textures/block/uru_block.png b/kubejs/assets/kubejs/textures/block/uru_block.png index 4f84e678..4e31ae78 100644 Binary files a/kubejs/assets/kubejs/textures/block/uru_block.png and b/kubejs/assets/kubejs/textures/block/uru_block.png differ diff --git a/kubejs/assets/kubejs/textures/item/uru_ingot.png b/kubejs/assets/kubejs/textures/item/uru_ingot.png index c8cd5eab..8663df3f 100644 Binary files a/kubejs/assets/kubejs/textures/item/uru_ingot.png and b/kubejs/assets/kubejs/textures/item/uru_ingot.png differ diff --git a/kubejs/assets/kubejs/textures/item/uru_nugget.png b/kubejs/assets/kubejs/textures/item/uru_nugget.png index bf69d4a8..e4fb18d5 100644 Binary files a/kubejs/assets/kubejs/textures/item/uru_nugget.png and b/kubejs/assets/kubejs/textures/item/uru_nugget.png differ diff --git a/kubejs/assets/ponderjs_generated/lang/en_us.json b/kubejs/assets/ponderjs_generated/lang/en_us.json new file mode 100644 index 00000000..eec765c0 --- /dev/null +++ b/kubejs/assets/ponderjs_generated/lang/en_us.json @@ -0,0 +1,11 @@ +{ + "atm6.ponder.atm_shard.atm_shard.header": "How to get ATM Star Shards", + "atm6.ponder.creative_energy_cube.creative_energy_cube.header": "How to charge the Creative Energy Cube", + "atm6.ponder.creative_energy_cube.creative_energy_cube.text_1": "Start by placing down two fully charged Ultimate Energy Cubes", + "atm6.ponder.creative_energy_cube.creative_energy_cube.text_2": "After that, two more Ultimate Induction Providers", + "atm6.ponder.creative_energy_cube.creative_energy_cube.text_3": "And finally, your empty Creative Energy Cube", + "atm6.ponder.atm_shard.atm_shard.text_2": "Place down an Anvil", + "atm6.ponder.atm_shard.atm_shard.text_3": "Then place any item frame on the anvil", + "atm6.ponder.atm_shard.atm_shard.text_4": "And finally place Mjollnir above the Anvil", + "atm6.ponder.atm_shard.atm_shard.text_1": "Start by having a Bedrock Block as a base" +} \ No newline at end of file diff --git a/kubejs/client_scripts/jei_removals.js b/kubejs/client_scripts/jei_removals.js index f797a038..ac134263 100644 --- a/kubejs/client_scripts/jei_removals.js +++ b/kubejs/client_scripts/jei_removals.js @@ -124,7 +124,8 @@ onEvent('jei.hide.items', e => { 'lazierae2:coal_dust', 'thermal:rf_coil_creative_augment', 'thermal:fluid_tank_creative_augment', - 'thermal:machine_catalyst_creative_augment' + 'thermal:machine_catalyst_creative_augment', + 'mekanism:dust_sulfur' ]) enviroStonesMats.forEach(stone => e.hide(`/enviromats:${stone}_.*/`)) @@ -179,4 +180,4 @@ onEvent('jei.hide.items', e => { hideStuff('mysticalagriculture', 'seeds', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'crimson_steel', 'chrome', 'electrum', 'elementium', 'enderium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'lumium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'oratchalcum', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril']) hideStuff('mysticalagriculture', 'essence', ['basalz', 'blazing_crystal', 'blitz', 'blizz', 'brass', 'bronze', 'compressed_iron', 'constantan', 'crimson_steel', 'chrome', 'electrum', 'elementium', 'enderium', 'ender_biotite', 'energized_steel', 'fluix', 'graphite', 'hop_graphite', 'invar', 'iridium', 'lumium', 'manasteel', 'niotic_crystal', 'nitro_crystal', 'oratchalcum', 'quartz_enriched_iron', 'refined_glowstone', 'refined_obsidian', 'rock_crystal', 'rubber', 'signalum', 'silicon', 'sky_stone', 'spirited_crystal', 'starmetal', 'steel', 'sulfur', 'terrasteel', 'titanium', 'tungsten', 'mithril']) //#endregion -}) \ No newline at end of file +}) diff --git a/kubejs/client_scripts/ponderjs/atm_shard_creation.js b/kubejs/client_scripts/ponderjs/atm_shard_creation.js new file mode 100644 index 00000000..4cb25e1d --- /dev/null +++ b/kubejs/client_scripts/ponderjs/atm_shard_creation.js @@ -0,0 +1,68 @@ +onEvent('ponder.registry', e => { + e.create('atm6:atm_shard', 'atmadditions:atm_star_shard') + .scene('atm_shard', + 'How to get ATM Star Shards', + 'allthemods:shard_bonk', + (scene, util) => { + scene.showBasePlate() + scene.idle(10) + + scene.addKeyframe(); + + scene.world().showSection(util.select().position(2, 0, 2), Facing.down) + scene.overlay() + .showSelectionWithText(util.select().position(2, 0, 2), 50) + .text("Start by having a Bedrock Block as a base") + .pointAt(util.vector().centerOf(2, 1, 2)) + .placeNearTarget() + scene.idle(60) + + scene.addKeyframe(); + + scene.world().showSection(util.select().position(2, 1, 2), Facing.down) + scene.overlay() + .showSelectionWithText(util.select().position(2, 1, 2), 50) + .text("Place down an Anvil") + .pointAt(util.vector().centerOf(2, 2, 2)) + .placeNearTarget() + scene.idle(60) + + scene.addKeyframe(); + + scene.world().createEntity( + 'quark:glass_frame', + util.vector().of(2, 2, 2), + entity => entity.mergeFullNBT('{Facing:1b}') + ) + + scene.overlay() + .showSelectionWithText(util.select().position(2, 2, 2), 50) + .text("Then place any item frame on the anvil") + .pointAt(util.vector().centerOf(2, 3, 2)) + .placeNearTarget() + scene.idle(60) + + scene.addKeyframe(); + + scene.world().showSection(util.select().position(2, 3, 2), Facing.down) + scene.overlay() + .showSelectionWithText(util.select().position(2, 3, 2), 50) + .text("And finally place Mjollnir above the Anvil") + .pointAt(util.vector().centerOf(2, 4, 2)) + .placeNearTarget() + scene.idle(60) + + scene.addKeyframe(); + + scene.overlay() + .showControls(new PonderInput([2.5, 2.5, 2.5], PonderPointing.DOWN).rightClick().withItem('atmadditions:atm_star'), 40) + scene.idle(40) + + scene.addKeyframe(); + + scene.overlay() + .showControls(new PonderInput([2.5, 3.5, 2], PonderPointing.LEFT).leftClick(), 40) + scene.idle(40) + } + ) +}) \ No newline at end of file diff --git a/kubejs/client_scripts/ponderjs/creative_cube_creation.js b/kubejs/client_scripts/ponderjs/creative_cube_creation.js new file mode 100644 index 00000000..a18601ac --- /dev/null +++ b/kubejs/client_scripts/ponderjs/creative_cube_creation.js @@ -0,0 +1,45 @@ +onEvent('ponder.registry', e => { + e.create('atm6:creative_energy_cube', 'mekanism:creative_energy_cube') + .scene('creative_energy_cube', + 'How to charge the Creative Energy Cube', + 'allthemods:creative_cube', + (scene, util) => { + scene.showBasePlate() + scene.idle(10) + + scene.addKeyframe(); + + scene.world().showSection(util.select().position(1, 1, 3), Facing.south) + scene.world().showSection(util.select().position(5, 1, 3), Facing.south) + scene.overlay() + .showSelectionWithText(util.select().position(1, 1, 3), 50) + .text("Start by placing down two fully charged Ultimate Energy Cubes") + .pointAt(util.vector().centerOf(1, 2, 3)) + .placeNearTarget() + scene.idle(60) + + scene.world().showSection(util.select().position(2, 1, 3), Facing.south) + scene.world().showSection(util.select().position(4, 1, 3), Facing.south) + scene.overlay() + .showSelectionWithText(util.select().position(2, 1, 3), 50) + .text("After that, two more Ultimate Induction Providers") + .pointAt(util.vector().centerOf(2, 2, 3)) + .placeNearTarget() + scene.idle(60) + + scene.world().showSection(util.select().position(3, 1, 3), Facing.south) + scene.overlay() + .showSelectionWithText(util.select().position(3, 1, 3), 50) + .text("And finally, your empty Creative Energy Cube") + .pointAt(util.vector().centerOf(3, 2, 3)) + .placeNearTarget() + scene.idle(60) + + scene.addKeyframe(); + + scene.overlay() + .showControls(new PonderInput([3.5, 2.5, 3.5], PonderPointing.DOWN).whileSneaking().rightClick().withItem('atmadditions:atm_star'), 60) + scene.idle(60) + } + ) +}) \ No newline at end of file diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 3425972f..24a44ff9 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -61,4 +61,81 @@ onEvent('item.tooltip', e => { formattedTooltip('mahoutsukai:morgan', 'This item is obtained by killing a tamed wolf with a Caliburn', 'Lexxie') formattedTooltip('craftingstation:crafting_station', 'Crafting Station Mk.II', 'Lexxie') formattedTooltip('atmadditions:atm_star_shard', 'Check JEI Info page for more info', 'Lexxie') + + //#region Pipez + //pipes + e.add('pipez:item_pipe', [ + [Text.of('Default:'), ' ', Text.of('4'), ' ', Text.of('items/20t')], + [Text.of('Basic:'), ' ', Text.of('8'), ' ', Text.of('items/15t')], + [Text.of('Improved:').gold(), ' ', Text.of('16').yellow(), ' ', Text.of('items/10t').gold()], + [Text.of('Advanced:').darkAqua(), ' ', Text.of('32').aqua(), ' ', Text.of('items/5t').darkAqua()], + [Text.of('Ultimate:').darkGray(), ' ', Text.of('64').gray(), ' ', Text.of('items/t').darkGray()], + [Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('items/t').darkPurple()], + Text.of(' - Lexxie').darkRed(), + ]) + e.add('pipez:fluid_pipe', [ + [Text.of('Default:'), ' ', Text.of('50'), ' ', Text.of('mB/t')], + [Text.of('Basic:'), ' ', Text.of('100'), ' ', Text.of('mB/t')], + [Text.of('Improved:').gold(), ' ', Text.of('500').yellow(), ' ', Text.of('mB/t').gold()], + [Text.of('Advanced:').darkAqua(), ' ', Text.of('2,000').aqua(), ' ', Text.of('mB/t').darkAqua()], + [Text.of('Ultimate:').darkGray(), ' ', Text.of('10,000').gray(), ' ', Text.of('mB/t').darkGray()], + [Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()], + Text.of(' - Lexxie').darkRed(), + ]) + e.add('pipez:gas_pipe', [ + [Text.of('Default:'), ' ', Text.of('200'), ' ', Text.of('mB/t')], + [Text.of('Basic:'), ' ', Text.of('400'), ' ', Text.of('mB/t')], + [Text.of('Improved:').gold(), ' ', Text.of('2,000').yellow(), ' ', Text.of('mB/t').gold()], + [Text.of('Advanced:').darkAqua(), ' ', Text.of('8,000').aqua(), ' ', Text.of('mB/t').darkAqua()], + [Text.of('Ultimate:').darkGray(), ' ', Text.of('40,000').gray(), ' ', Text.of('mB/t').darkGray()], + [Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()], + Text.of(' - Lexxie').darkRed(), + ]) + e.add('pipez:energy_pipe', [ + [Text.of('Default:'), ' ', Text.of('256'), ' ', Text.of('FE/t')], + [Text.of('Basic:'), ' ', Text.of('1,024'), ' ', Text.of('FE/t')], + [Text.of('Improved:').gold(), ' ', Text.of('8,192').yellow(), ' ', Text.of('FE/t').gold()], + [Text.of('Advanced:').darkAqua(), ' ', Text.of('32,768').aqua(), ' ', Text.of('FE/t').darkAqua()], + [Text.of('Ultimate:').darkGray(), ' ', Text.of('131,072').gray(), ' ', Text.of('FE/t').darkGray()], + [Text.of('Infinity:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('FE/t').darkPurple()], + Text.of(' - Lexxie').darkRed(), + ]) + + //upgrades + e.add('pipez:basic_upgrade', [ + [Text.of('Item:'), ' ', Text.of('8'), ' ', Text.of('items/t')], + [Text.of('Fluid:'), ' ', Text.of('100'), ' ', Text.of('mB/t')], + [Text.of('Gas:'), ' ', Text.of('400'), ' ', Text.of('mB/t')], + [Text.of('Energy:'), ' ', Text.of('1,024'), ' ', Text.of('FE/t')], + Text.of(' - Lexxie').darkRed(), + ]) + e.add('pipez:improved_upgrade', [ + [Text.of('Item:').gold(), ' ', Text.of('16').yellow(), ' ', Text.of('items/t').gold()], + [Text.of('Fluid:').gold(), ' ', Text.of('500').yellow(), ' ', Text.of('mB/t').gold()], + [Text.of('Gas:').gold(), ' ', Text.of('2,000').yellow(), ' ', Text.of('mB/t').gold()], + [Text.of('Energy:').gold(), ' ', Text.of('8,192').yellow(), ' ', Text.of('FE/t').gold()], + Text.of(' - Lexxie').darkRed(), + ]) + e.add('pipez:advanced_upgrade', [ + [Text.of('Item:').darkAqua(), ' ', Text.of('32').aqua(), ' ', Text.of('items/t').darkAqua()], + [Text.of('Fluid:').darkAqua(), ' ', Text.of('2,000').aqua(), ' ', Text.of('mB/t').darkAqua()], + [Text.of('Gas:').darkAqua(), ' ', Text.of('8,000').aqua(), ' ', Text.of('mB/t').darkAqua()], + [Text.of('Energy:').darkAqua(), ' ', Text.of('32,768').aqua(), ' ', Text.of('FE/t').darkAqua()], + Text.of(' - Lexxie').darkRed(), + ]) + e.add('pipez:ultimate_upgrade', [ + [Text.of('Item:').darkGray(), ' ', Text.of('64').gray(), ' ', Text.of('items/t').darkGray()], + [Text.of('Fluid:').darkGray(), ' ', Text.of('10,000').gray(), ' ', Text.of('mB/t').darkGray()], + [Text.of('Gas:').darkGray(), ' ', Text.of('40,000').gray(), ' ', Text.of('mB/t').darkGray()], + [Text.of('Energy:').darkGray(), ' ', Text.of('131,072').gray(), ' ', Text.of('FE/t').darkGray()], + Text.of(' - Lexxie').darkRed(), + ]) + e.add('pipez:infinity_upgrade', [ + [Text.of('Item:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('items/t').darkPurple()], + [Text.of('Fluid:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()], + [Text.of('Gas:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('mB/t').darkPurple()], + [Text.of('Energy:').darkPurple(), ' ', Text.of('2,147,483,647').lightPurple(), ' ', Text.of('FE/t').darkPurple()], + Text.of(' - Lexxie').darkRed(), + ]) + //#endregion }) \ No newline at end of file diff --git a/kubejs/server_scripts/advanced_interactions/turtles.js b/kubejs/server_scripts/advanced_interactions/turtles.js index 35eb2a64..d7dbebe2 100644 --- a/kubejs/server_scripts/advanced_interactions/turtles.js +++ b/kubejs/server_scripts/advanced_interactions/turtles.js @@ -15,4 +15,5 @@ onEvent('item.entity_interact', e => { } } } -}) \ No newline at end of file +}) + diff --git a/kubejs/server_scripts/mod_specific/_atm/allthemodium.js b/kubejs/server_scripts/mod_specific/_allthemods/allthemodium.js similarity index 100% rename from kubejs/server_scripts/mod_specific/_atm/allthemodium.js rename to kubejs/server_scripts/mod_specific/_allthemods/allthemodium.js diff --git a/kubejs/server_scripts/mod_specific/_atm/atm_shard.js b/kubejs/server_scripts/mod_specific/_allthemods/atm_shard.js similarity index 100% rename from kubejs/server_scripts/mod_specific/_atm/atm_shard.js rename to kubejs/server_scripts/mod_specific/_allthemods/atm_shard.js diff --git a/kubejs/server_scripts/mod_specific/_atm/atm_star.js b/kubejs/server_scripts/mod_specific/_allthemods/atm_star.js similarity index 100% rename from kubejs/server_scripts/mod_specific/_atm/atm_star.js rename to kubejs/server_scripts/mod_specific/_allthemods/atm_star.js diff --git a/kubejs/server_scripts/mod_specific/_atm/uu_matter_recipes.js b/kubejs/server_scripts/mod_specific/_allthemods/uu_matter_recipes.js similarity index 100% rename from kubejs/server_scripts/mod_specific/_atm/uu_matter_recipes.js rename to kubejs/server_scripts/mod_specific/_allthemods/uu_matter_recipes.js diff --git a/kubejs/server_scripts/mod_specific/_minecraft/minecraft.js b/kubejs/server_scripts/mod_specific/_minecraft/minecraft.js index 37112443..07cc2db8 100644 --- a/kubejs/server_scripts/mod_specific/_minecraft/minecraft.js +++ b/kubejs/server_scripts/mod_specific/_minecraft/minecraft.js @@ -18,8 +18,8 @@ onEvent('recipes', e => { e.recipes.immersiveengineering.crusher(`4x minecraft:nether_wart`, `minecraft:nether_wart_block`).id('kubejs:minecraft/immersiveengineering_crusher/nether_wart') e.recipes.mekanism.crushing('4x minecraft:blaze_powder', '#forge:rods/blaze') - e.recipes.mekanism.sawing(`6x minecraft:oak_planks`, `byg:withering_oak_log`, Item.of('mekanism:sawdust').withChance(0.25)).id(`kubejs:saw/byg_log_withering_oak`) - e.recipes.mekanism.sawing(`6x minecraft:birch_planks`, [`byg:stripped_palo_verde_log`, `byg:palo_verde_log`], Item.of('mekanism:sawdust').withChance(0.25)).id(`kubejs:saw/byg_log_palo_verde`) + e.recipes.mekanism.sawing(`6x minecraft:oak_planks`, `byg:withering_oak_log`, Item.of('thermal:sawdust').withChance(0.25)).id(`kubejs:saw/byg_log_withering_oak`) + e.recipes.mekanism.sawing(`6x minecraft:birch_planks`, [`byg:stripped_palo_verde_log`, `byg:palo_verde_log`], Item.of('thermal:sawdust').withChance(0.25)).id(`kubejs:saw/byg_log_palo_verde`) e.recipes.mekanism.enriching('4x minecraft:blaze_powder', 'minecraft:blaze_rod').id('kubejs:minecraft/enriching/blaze_powder') e.shapeless('4x minecraft:clay_ball', 'minecraft:clay').id(`kubejs:minecraft/clay`) diff --git a/kubejs/server_scripts/mod_specific/apotheosis/apotheosis.js b/kubejs/server_scripts/mod_specific/apotheosis/apotheosis.js index 2347c96e..712e3266 100644 --- a/kubejs/server_scripts/mod_specific/apotheosis/apotheosis.js +++ b/kubejs/server_scripts/mod_specific/apotheosis/apotheosis.js @@ -1,4 +1,12 @@ onEvent('recipes', e => { + e.shaped('apotheosis:boss_summoner', ['CVC', 'AEA', 'CUC'], { + C: 'atmadditions:allthecatalystium', + E: ['minecraft:enderman_spawn_egg', 'minecraft:skeleton_spawn_egg', 'minecraft:zombie_spawn_egg', 'minecraft:zombified_piglin_spawn_egg'], + A: 'allthemodium:allthemodium_ingot', + V: 'allthemodium:vibranium_ingot', + U: 'allthemodium:unobtainium_ingot' + }).id(`kubejs:apotheosis/boss_summoner`) + removeRecipeByID(e, [ 'apotheosis:fletching/iron_mining_arrow', 'apotheosis:fletching/diamond_mining_arrow' diff --git a/kubejs/server_scripts/mod_specific/immersive_engineering/immersive_engineering.js b/kubejs/server_scripts/mod_specific/immersive_engineering/immersive_engineering.js index 6d85861d..402e644f 100644 --- a/kubejs/server_scripts/mod_specific/immersive_engineering/immersive_engineering.js +++ b/kubejs/server_scripts/mod_specific/immersive_engineering/immersive_engineering.js @@ -13,7 +13,7 @@ onEvent('recipes', e => { result: { fluid: 'immersivepetroleum:diesel', amount: 7 }, input: { tag: 'forge:diesel_sulfur', amount: 7 }, secondary_input: { tag: 'minecraft:water', amount: 7 }, - secondary_result: { item: 'immersiveengineering:dust_sulfur', chance: '0.02' } + secondary_result: { item: 'thermal:sulfur_dust', chance: '0.02' } }).id('kubejs:immersivepetroleum/hydrotreater/diesel') e.custom({ type: 'immersivepetroleum:distillation', diff --git a/kubejs/server_scripts/mod_specific/mekanism/mekanism.js b/kubejs/server_scripts/mod_specific/mekanism/mekanism.js index e1055f5b..e762e190 100644 --- a/kubejs/server_scripts/mod_specific/mekanism/mekanism.js +++ b/kubejs/server_scripts/mod_specific/mekanism/mekanism.js @@ -119,13 +119,13 @@ onEvent('recipes', e => { e.recipes.mekanism.crushing('5x mekanism:bio_fuel', '#misctags:biofuel5') e.recipes.mekanism.crushing('7x mekanism:bio_fuel', '#misctags:biofuel7') e.recipes.mekanism.crushing('8x mekanism:bio_fuel', '#misctags:biofuel8') - e.recipes.mekanism.sawing('8x mekanism:sawdust', 'byg:imbued_nightshade_log').id('kubejs:saw/byg_log_imbued_nightshade') + e.recipes.mekanism.sawing('8x thermal:sawdust', 'byg:imbued_nightshade_log').id('kubejs:saw/byg_log_imbued_nightshade') utils.listOf(['aspen', 'baobab', 'blue_enchanted', 'cherry', 'cika', 'cypress', 'ebony', 'ether', 'fir', 'green_enchanted', 'holly', 'jacaranda', 'lament', 'mahogany', 'mangrove', 'maple', 'nightshade', 'palm', 'pine', 'rainbow_eucalyptus', 'redwood', 'skyris', 'willow', 'witch_hazel', 'zelkova']).forEach(type => { e.recipes.mekanism.sawing( `6x byg:${type}_planks`, [`byg:stripped_${type}_log`, `byg:${type}_log`], - Item.of('mekanism:sawdust').withChance(0.25) + Item.of('thermal:sawdust').withChance(0.25) ).id(`kubejs:saw/byg_log_${type}`) }) diff --git a/kubejs/server_scripts/mod_specific/pedestals/pedestals.js b/kubejs/server_scripts/mod_specific/pedestals/pedestals.js index 30cdbf59..86f3e1c0 100644 --- a/kubejs/server_scripts/mod_specific/pedestals/pedestals.js +++ b/kubejs/server_scripts/mod_specific/pedestals/pedestals.js @@ -38,9 +38,9 @@ onEvent('recipes', e => { pedestalCrush('pamhc2foodcore:flouritem', 1, 'forge:flour_plants', 1) pedestalCrush('appliedenergistics2:fluix_dust', 1, 'appliedenergistics2:fluix_crystal', 0) pedestalCrush('appliedenergistics2:certus_quartz_dust', 1, 'forge:gems/certus_quartz', 1) - pedestalCrush('mekanism:dust_quartz', 1, 'forge:gems/quartz', 1) + pedestalCrush('thermal:quartz_dust', 1, 'forge:gems/quartz', 1) - pedestalSaw('mekanism:sawdust', 1, 'forge:rods/wooden', 1) + pedestalSaw('thermal:sawdust', 1, 'forge:rods/wooden', 1) pedestalSaw('minecraft:stick', 4, 'minecraft:planks', 1) pedestalSaw('minecraft:stick', 2, 'minecraft:wooden_slabs', 1) diff --git a/kubejs/server_scripts/mod_specific/pipez/pipez.js b/kubejs/server_scripts/mod_specific/pipez/pipez.js deleted file mode 100644 index 736e2b2d..00000000 --- a/kubejs/server_scripts/mod_specific/pipez/pipez.js +++ /dev/null @@ -1,7 +0,0 @@ -onEvent('recipes', e => { - e.shaped('pipez:infinity_upgrade', ['ABA', 'BCB', 'ABA'], { - A: 'allthemodium:unobtainium_ingot', - B: 'compressium:redstone_4', - C: 'pipez:ultimate_upgrade' - }).id('kubejs:pipez/infinity_upgrade') -}) \ No newline at end of file diff --git a/kubejs/server_scripts/mod_specific/pneumaticcraft/pneumaticcraft.js b/kubejs/server_scripts/mod_specific/pneumaticcraft/pneumaticcraft.js index c30d6c70..5b45689b 100644 --- a/kubejs/server_scripts/mod_specific/pneumaticcraft/pneumaticcraft.js +++ b/kubejs/server_scripts/mod_specific/pneumaticcraft/pneumaticcraft.js @@ -103,4 +103,48 @@ onEvent('recipes', e => { 'count': 64 } ], 'pneumaticcraft:creative_compressed_iron_block', 1, 4.9) + + //make plastic recipes take #forge:plastic + pressure([{ + 'type': 'pneumaticcraft:stacked_item', + 'item': 'minecraft:gold_nugget', + 'count': 3 + },{ + 'type': 'pneumaticcraft:stacked_item', + 'item': 'minecraft:redstone', + 'count': 1 + },{ + 'type': 'pneumaticcraft:stacked_item', + 'tag': 'forge:plastic', + 'count': 1 + }], 'pneumaticcraft:transistor', 1, 1.0) + e.remove({id: 'pneumaticcraft:pressure_chamber/transistor'}) + pressure([{ + 'type': 'pneumaticcraft:stacked_item', + 'item': 'minecraft:gold_nugget', + 'count': 2 + },{ + 'type': 'pneumaticcraft:stacked_item', + 'tag': 'forge:slimeballs', + 'count': 1 + },{ + 'type': 'pneumaticcraft:stacked_item', + 'tag': 'forge:plastic', + 'count': 1 + }], 'pneumaticcraft:capacitor', 1, 1.0) + e.remove({id: 'pneumaticcraft:pressure_chamber/capacitor'}) + pressure([{ + 'type': 'pneumaticcraft:stacked_item', + 'item': 'minecraft:redstone_torch', + 'count': 2 + },{ + 'type': 'pneumaticcraft:stacked_item', + 'item': 'minecraft:gold_nugget', + 'count': 3 + },{ + 'type': 'pneumaticcraft:stacked_item', + 'tag': 'forge:plastic', + 'count': 1 + }], 'pneumaticcraft:empty_pcb', 3, 1.5) + e.remove({id: 'pneumaticcraft:pressure_chamber/empty_pcb'}) }) \ No newline at end of file diff --git a/kubejs/server_scripts/mod_specific/storage_drawers/storage_drawers.js b/kubejs/server_scripts/mod_specific/storage_drawers/storage_drawers.js index 32619319..a743f4e4 100644 --- a/kubejs/server_scripts/mod_specific/storage_drawers/storage_drawers.js +++ b/kubejs/server_scripts/mod_specific/storage_drawers/storage_drawers.js @@ -4,4 +4,7 @@ onEvent('recipes', e => { S: 'atmadditions:atm_star', A: 'allthemodium:allthemodium_block' }) + e.replaceInput({ output: 'storagedrawers:compacting_drawers_3', type: 'minecraft:crafting_shaped' }, 'minecraft:stone', '#forge:stone') + e.replaceInput({ output: 'storagedrawers:controller', type: 'minecraft:crafting_shaped' }, 'minecraft:stone', '#forge:stone') + e.replaceInput({ output: 'storagedrawers:controller_slave', type: 'minecraft:crafting_shaped' }, 'minecraft:stone', '#forge:stone') }) diff --git a/kubejs/server_scripts/unify.js b/kubejs/server_scripts/unify.js index be2060f6..31ba6189 100644 --- a/kubejs/server_scripts/unify.js +++ b/kubejs/server_scripts/unify.js @@ -371,14 +371,17 @@ onEvent('recipes', e => { e.replaceInput('iceandfire:sapphire', '#forge:gems/sapphire') e.replaceInput('iceandfire:sapphire_block', '#forge:storage_blocks/sapphire') e.replaceInput('minecraft:stick', '#forge:rods/wooden') - e.replaceInput('minecraft:stone', '#forge:stone') - e.replaceInput({ output: 'minecraft:furnace', type: 'minecraft:crafting_shaped' }, 'minecraft:stone', ['#forge:stone', '#forge:cobblestone']) - e.replaceInput({ output: 'minecraft:stone_pickaxe', type: 'minecraft:crafting_shaped' }, 'minecraft:stone', ['#forge:stone', '#forge:cobblestone']) + e.replaceInput('pneumaticcraft:plastic','#forge:plastic') e.replaceOutput('immersivepetroleum:bitumen', 'thermal:bitumen') e.replaceOutput('lazierae2:coal_dust', 'mekanism:dust_coal') e.replaceOutput('iceandfire:sapphire_gem', 'projectred-core:sapphire') e.replaceOutput('iceandfire:sapphire_block', 'projectred-core:sapphire_block') + e.replaceOutput('mekanism:sawdust', 'thermal:sawdust') + e.replaceOutput('mekanism:dust_sulfur', 'thermal:sulfur_dust') + e.replaceOutput('immersiveengineering:dust_sulfur', 'thermal:sulfur_dust') + e.replaceOutput('mekanism:dust_quartz', 'thermal:quartz_dust') + e.replaceOutput('appliedenergistics2:nether_quartz_dust', 'thermal:quartz_dust') // #region ExtraDisks & ExtraStorage function unifyExtraStorageDisks(entries) {