From 0c15b212e34e119b9272ef5a7d3b5d6c1c5a281f Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 19 Nov 2022 11:18:23 +0100 Subject: [PATCH 01/38] Disable Ore gen part I Disabled ore gen from: Mekanism (Osmium / Tin / Lead / Uranium / Fluorite) Create (Zinc and its veins) IE (Bauxite / Lead / Silver / Nickel / Deep Nickel? / Uranium) RF Tools (because em.. why not ^^"?) (Dimensional Shard) --- config/Mekanism/world.toml | 10 +++++----- config/create-common.toml | 2 +- config/rftoolsbase-common.toml | 8 ++++---- defaultconfigs/immersiveengineering-server.toml | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/Mekanism/world.toml b/config/Mekanism/world.toml index 5864a514b..2731a3676 100644 --- a/config/Mekanism/world.toml +++ b/config/Mekanism/world.toml @@ -10,7 +10,7 @@ #Generation Settings for tin ore. [world_generation.tin] #Determines if tin ore should be added to world generation. - shouldGenerate = true + shouldGenerate = false #small tin vein Generation Settings. [world_generation.tin.small] @@ -97,7 +97,7 @@ #Generation Settings for osmium ore. [world_generation.osmium] #Determines if osmium ore should be added to world generation. - shouldGenerate = true + shouldGenerate = false #upper osmium vein Generation Settings. [world_generation.osmium.upper] @@ -225,7 +225,7 @@ #Generation Settings for uranium ore. [world_generation.uranium] #Determines if uranium ore should be added to world generation. - shouldGenerate = true + shouldGenerate = false #small uranium vein Generation Settings. [world_generation.uranium.small] @@ -312,7 +312,7 @@ #Generation Settings for fluorite ore. [world_generation.fluorite] #Determines if fluorite ore should be added to world generation. - shouldGenerate = true + shouldGenerate = false #normal fluorite vein Generation Settings. [world_generation.fluorite.normal] @@ -399,7 +399,7 @@ #Generation Settings for lead ore. [world_generation.lead] #Determines if lead ore should be added to world generation. - shouldGenerate = true + shouldGenerate = false #normal lead vein Generation Settings. [world_generation.lead.normal] diff --git a/config/create-common.toml b/config/create-common.toml index 0a889e901..ba656d760 100644 --- a/config/create-common.toml +++ b/config/create-common.toml @@ -7,7 +7,7 @@ #. #. #Prevents all worldgen added by Create from taking effect - disableWorldGen = false + disableWorldGen = true [worldgen.v2.striated_ores_nether] #. diff --git a/config/rftoolsbase-common.toml b/config/rftoolsbase-common.toml index 6acd1e871..643f96706 100644 --- a/config/rftoolsbase-common.toml +++ b/config/rftoolsbase-common.toml @@ -6,7 +6,7 @@ [worldgen.dimensions] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 6 + oreChances = 0 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 10 @@ -21,7 +21,7 @@ [worldgen.overworld] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 2 + oreChances = 0 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 5 @@ -36,7 +36,7 @@ [worldgen.nether] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 8 + oreChances = 0 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 8 @@ -51,7 +51,7 @@ [worldgen.end] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 8 + oreChances = 0 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 10 diff --git a/defaultconfigs/immersiveengineering-server.toml b/defaultconfigs/immersiveengineering-server.toml index 643d9c71c..a373ec37c 100644 --- a/defaultconfigs/immersiveengineering-server.toml +++ b/defaultconfigs/immersiveengineering-server.toml @@ -352,7 +352,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 6 + vein_size = 0 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = 32 @@ -375,7 +375,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 8 + vein_size = 0 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -32 @@ -398,7 +398,7 @@ air_exposure = 0.25 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 9 + vein_size = 0 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -48 @@ -421,7 +421,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 5 + vein_size = 0 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -64 @@ -444,7 +444,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 6 + vein_size = 0 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -120 @@ -467,7 +467,7 @@ air_exposure = 0.5 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 4 + vein_size = 0 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -64 From 156788838acd1d237f8fd7ad40e42e27a0fff4c3 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 19 Nov 2022 12:04:31 +0100 Subject: [PATCH 02/38] Disable ore gen Part II Disabled ore gen for: Powah (Uranite / Rich / Poor) Occultism (Silver) Blue skies (Horizonite / Ventium / Falsite) --- config/powah.json5 | 6 +++--- kubejs/startup_scripts/worldgen_remove.js | 14 ++++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/powah.json5 b/config/powah.json5 index c7ea29450..cb31b2719 100644 --- a/config/powah.json5 +++ b/config/powah.json5 @@ -3,9 +3,9 @@ "worldgen": { // Enable this to disable worldgen entirely. If true, the other options have no effect. "disable_all": false, - "poor_uraninite_veins_per_chunk": 8, - "uraninite_veins_per_chunk": 6, - "dense_uraninite_veins_per_chunk": 3, + "poor_uraninite_veins_per_chunk": 0, + "uraninite_veins_per_chunk": 0, + "dense_uraninite_veins_per_chunk": 0, "dry_ice_veins_per_chunk": 9 }, // Other general config options. diff --git a/kubejs/startup_scripts/worldgen_remove.js b/kubejs/startup_scripts/worldgen_remove.js index 8b561ee0c..27c777082 100644 --- a/kubejs/startup_scripts/worldgen_remove.js +++ b/kubejs/startup_scripts/worldgen_remove.js @@ -1,8 +1,14 @@ WorldgenEvents.remove((event) => { // https://mods.latvian.dev/books/kubejs/page/worldgen-events // console.debugEnabled = true; - // event.removeOres((props) => { - // props.worldgenLayer = 'underground_ores'; - // props.blocks = ['blue_skies:horizonite_ore', 'blue_skies:ventium_ore', 'blue_skies:falsite_ore']; - // }); + event.removeOres((props) => { + props.worldgenLayer = 'underground_ores'; + props.blocks = [ + 'blue_skies:horizonite_ore', + 'blue_skies:ventium_ore', + 'blue_skies:falsite_ore', + 'occultism:silver_ore', + 'occultism:silver_ore_deepslate' + ]; + }); }); From 1ef244d68f52cdca836f9e36d32de491d3e4223b Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 20 Nov 2022 08:52:35 +0100 Subject: [PATCH 03/38] Create copper.json for testing purposes --- .../emendatusenigmatica/material/copper.json | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 config/emendatusenigmatica/material/copper.json diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json new file mode 100644 index 000000000..27924515a --- /dev/null +++ b/config/emendatusenigmatica/material/copper.json @@ -0,0 +1,57 @@ +{ + "id": "copper", + "source": "vanilla", + "localizedName": "Copper", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 0 + }, + "colors": { + "materialColor": "b87333" + }, + "compat": { + "create": { + "crushing": { + "firstOutputCount": 2, + "secondOutputCount": 1, + "secondOutputChance": 0.35 + }, + "splashing": { + "secondOutput": "", + "secondOutputCount": 1.75, + "secondOutputChance": 0.3 + } + }, + "thermal": { + "pulverizer": { + "firstOutputCount": 2, + "firstOutputChance": 1, + "secondOutput": "", + "secondOutputCount": 1, + "secondOutputChance": 0.20 + }, + "induction": { + "firstOutputCount": 2, + "firstOutputChance": 1, + "secondOutput": "", + "secondOutputCount": 1, + "secondOutputChance": 0.15 + } + } + } +} \ No newline at end of file From d1d0cf67ce16d4fec96d5451391b2b830a8df317 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 20 Nov 2022 09:02:42 +0100 Subject: [PATCH 04/38] Update ingredient-list-mod-sort-order.ini --- config/jei/ingredient-list-mod-sort-order.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini index c81902e91..9db853f92 100644 --- a/config/jei/ingredient-list-mod-sort-order.ini +++ b/config/jei/ingredient-list-mod-sort-order.ini @@ -84,3 +84,4 @@ Industrial Foregoing Industrial Foregoing: Core Industrial Foregoing: Tools Industrial Foregoing: Transport & Storage +Emendatus Enigmatica From 760dd4c653b035c4381b77540fbc8584296b7497 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 20 Nov 2022 10:50:39 +0100 Subject: [PATCH 05/38] AU Config changes and copper.json tweaks --- config/almostunified/unify.json | 10 ++++++-- .../emendatusenigmatica/material/copper.json | 23 +++---------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json index 83d7b19e9..7d78be4be 100644 --- a/config/almostunified/unify.json +++ b/config/almostunified/unify.json @@ -1,8 +1,8 @@ { "modPriorities": [ + "emendatusenigmatica", "minecraft", "kubejs", - "crafttweaker", "create", "thermal", "mekanism", @@ -28,9 +28,15 @@ "forge:plates/{material}", "forge:rods/{material}", "forge:storage_blocks/{material}", + "forge:storage_blocks/raw_{material}", "forge:slag", "forge:coal_coke", - "forge:sawdust" + "forge:sawdust", + "mekanism:crystals/{material}", + "mekanism:shards/{material}", + "mekanism:clumps/{material}", + "mekanism:dirty_dusts/{material}", + "mekanism:shards/{material}" ], "materials": [ "aeternium", diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json index 27924515a..a596e73a8 100644 --- a/config/emendatusenigmatica/material/copper.json +++ b/config/emendatusenigmatica/material/copper.json @@ -3,7 +3,6 @@ "source": "vanilla", "localizedName": "Copper", "processedTypes": [ - "storage_block", "ore", "raw", "crushed_ore", @@ -22,7 +21,7 @@ "harvestLevel": 0 }, "colors": { - "materialColor": "b87333" + "materialColor": "c87456" }, "compat": { "create": { @@ -32,26 +31,10 @@ "secondOutputChance": 0.35 }, "splashing": { - "secondOutput": "", - "secondOutputCount": 1.75, + "secondOutput": "emendatusenigmatica:copper_nugget", + "secondOutputCount": 9, "secondOutputChance": 0.3 } - }, - "thermal": { - "pulverizer": { - "firstOutputCount": 2, - "firstOutputChance": 1, - "secondOutput": "", - "secondOutputCount": 1, - "secondOutputChance": 0.20 - }, - "induction": { - "firstOutputCount": 2, - "firstOutputChance": 1, - "secondOutput": "", - "secondOutputCount": 1, - "secondOutputChance": 0.15 - } } } } \ No newline at end of file From 57b634ceec3621911459089736f87190b7e20713 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Tue, 22 Nov 2022 12:08:51 +0100 Subject: [PATCH 06/38] Add tags create:crushed_ores/{material} to create crushed ores --- .../base/tags/items/create/crushed_ores.js | 7 +++ .../constants/metal_properties.js | 55 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 kubejs/server_scripts/base/tags/items/create/crushed_ores.js diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js new file mode 100644 index 000000000..02f1186cb --- /dev/null +++ b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js @@ -0,0 +1,7 @@ +ServerEvents.tags('item', (event) => { + metal_properties.forEach(metal => { + if (metal.special.create.hasCrushedOre) { + event.add(`create:crushed_ores/${material}`, `create:crushed_${material}_ore`) + } + }) +}); diff --git a/kubejs/server_scripts/constants/metal_properties.js b/kubejs/server_scripts/constants/metal_properties.js index 5e3806a62..123652474 100644 --- a/kubejs/server_scripts/constants/metal_properties.js +++ b/kubejs/server_scripts/constants/metal_properties.js @@ -15,6 +15,11 @@ const metal_properties = { create: { processingTime: 400 } + }, + special: { + create: { + hasCrushedOre: true + } } }, nickel: { @@ -27,6 +32,11 @@ const metal_properties = { create: { processingTime: 350 } + }, + special: { + create: { + hasCrushedOre: true + } } }, gold: { @@ -39,6 +49,11 @@ const metal_properties = { create: { processingTime: 300 } + }, + special: { + create: { + hasCrushedOre: true + } } }, copper: { @@ -51,6 +66,11 @@ const metal_properties = { create: { processingTime: 350 } + }, + special: { + create: { + hasCrushedOre: true + } } }, aluminum: { @@ -75,6 +95,11 @@ const metal_properties = { create: { processingTime: 300 } + }, + special: { + create: { + hasCrushedOre: true + } } }, silver: { @@ -87,6 +112,11 @@ const metal_properties = { create: { processingTime: 300 } + }, + special: { + create: { + hasCrushedOre: true + } } }, uranium: { @@ -99,6 +129,11 @@ const metal_properties = { create: { processingTime: 400 } + }, + special: { + create: { + hasCrushedOre: true + } } }, osmium: { @@ -111,6 +146,11 @@ const metal_properties = { create: { processingTime: 400 } + }, + special: { + create: { + hasCrushedOre: true + } } }, tin: { @@ -123,6 +163,11 @@ const metal_properties = { create: { processingTime: 350 } + }, + special: { + create: { + hasCrushedOre: true + } } }, zinc: { @@ -135,6 +180,11 @@ const metal_properties = { create: { processingTime: 350 } + }, + special: { + create: { + hasCrushedOre: true + } } }, cobalt: { @@ -147,6 +197,11 @@ const metal_properties = { create: { processingTime: 400 } + }, + special: { + create: { + hasCrushedOre: true + } } }, iesnium: { From 087cea216cf5efeee06184fe5e713be2910cc888 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:49:24 +0100 Subject: [PATCH 07/38] Update crushed_ores.js --- .../server_scripts/base/tags/items/create/crushed_ores.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js index 02f1186cb..deba12650 100644 --- a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js +++ b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js @@ -1,7 +1,7 @@ ServerEvents.tags('item', (event) => { - metal_properties.forEach(metal => { - if (metal.special.create.hasCrushedOre) { - event.add(`create:crushed_ores/${material}`, `create:crushed_${material}_ore`) + for (let metal in metal_properties) { + if (metal_properties[metal].special.create.hasCrushedOre == true) { + event.add(`create:crushed_ores/${metal}`, `create:crushed_${metal}_ore`) } - }) + } }); From 1d56ed2e8dd4581222dc1f54add3bfd265b1ea3e Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Wed, 23 Nov 2022 09:18:04 +0100 Subject: [PATCH 08/38] Update crushed_ores.js and metal_properties.js --- .../base/tags/items/create/crushed_ores.js | 2 +- kubejs/server_scripts/constants/metal_properties.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js index deba12650..bd6d940bb 100644 --- a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js +++ b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js @@ -1,6 +1,6 @@ ServerEvents.tags('item', (event) => { for (let metal in metal_properties) { - if (metal_properties[metal].special.create.hasCrushedOre == true) { + if (metal_properties[metal].special.create.hasCrushedOre) { event.add(`create:crushed_ores/${metal}`, `create:crushed_${metal}_ore`) } } diff --git a/kubejs/server_scripts/constants/metal_properties.js b/kubejs/server_scripts/constants/metal_properties.js index 123652474..1bb60a0ac 100644 --- a/kubejs/server_scripts/constants/metal_properties.js +++ b/kubejs/server_scripts/constants/metal_properties.js @@ -83,6 +83,11 @@ const metal_properties = { create: { processingTime: 300 } + }, + special: { + create: { + hasCrushedOre: true + } } }, lead: { @@ -197,11 +202,6 @@ const metal_properties = { create: { processingTime: 400 } - }, - special: { - create: { - hasCrushedOre: true - } } }, iesnium: { From 8a0f53590f959eb53a7bf2455771744b1c508a2a Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Wed, 23 Nov 2022 10:05:44 +0100 Subject: [PATCH 09/38] Finish up Copper.json --- config/emendatusenigmatica/material/copper.json | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json index a596e73a8..c5b5c7fc1 100644 --- a/config/emendatusenigmatica/material/copper.json +++ b/config/emendatusenigmatica/material/copper.json @@ -3,6 +3,7 @@ "source": "vanilla", "localizedName": "Copper", "processedTypes": [ + "storage_block", "ore", "raw", "crushed_ore", @@ -22,19 +23,5 @@ }, "colors": { "materialColor": "c87456" - }, - "compat": { - "create": { - "crushing": { - "firstOutputCount": 2, - "secondOutputCount": 1, - "secondOutputChance": 0.35 - }, - "splashing": { - "secondOutput": "emendatusenigmatica:copper_nugget", - "secondOutputCount": 9, - "secondOutputChance": 0.3 - } - } } } \ No newline at end of file From 6b2544acf8cf08a896f4f1d5a0bafbb959020da0 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Wed, 23 Nov 2022 17:42:27 +0100 Subject: [PATCH 10/38] Revert changes for crushed_ores.js --- .../base/tags/items/create/crushed_ores.js | 7 --- .../constants/metal_properties.js | 55 ------------------- 2 files changed, 62 deletions(-) delete mode 100644 kubejs/server_scripts/base/tags/items/create/crushed_ores.js diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js deleted file mode 100644 index bd6d940bb..000000000 --- a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js +++ /dev/null @@ -1,7 +0,0 @@ -ServerEvents.tags('item', (event) => { - for (let metal in metal_properties) { - if (metal_properties[metal].special.create.hasCrushedOre) { - event.add(`create:crushed_ores/${metal}`, `create:crushed_${metal}_ore`) - } - } -}); diff --git a/kubejs/server_scripts/constants/metal_properties.js b/kubejs/server_scripts/constants/metal_properties.js index 1bb60a0ac..5e3806a62 100644 --- a/kubejs/server_scripts/constants/metal_properties.js +++ b/kubejs/server_scripts/constants/metal_properties.js @@ -15,11 +15,6 @@ const metal_properties = { create: { processingTime: 400 } - }, - special: { - create: { - hasCrushedOre: true - } } }, nickel: { @@ -32,11 +27,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - special: { - create: { - hasCrushedOre: true - } } }, gold: { @@ -49,11 +39,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - special: { - create: { - hasCrushedOre: true - } } }, copper: { @@ -66,11 +51,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - special: { - create: { - hasCrushedOre: true - } } }, aluminum: { @@ -83,11 +63,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - special: { - create: { - hasCrushedOre: true - } } }, lead: { @@ -100,11 +75,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - special: { - create: { - hasCrushedOre: true - } } }, silver: { @@ -117,11 +87,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - special: { - create: { - hasCrushedOre: true - } } }, uranium: { @@ -134,11 +99,6 @@ const metal_properties = { create: { processingTime: 400 } - }, - special: { - create: { - hasCrushedOre: true - } } }, osmium: { @@ -151,11 +111,6 @@ const metal_properties = { create: { processingTime: 400 } - }, - special: { - create: { - hasCrushedOre: true - } } }, tin: { @@ -168,11 +123,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - special: { - create: { - hasCrushedOre: true - } } }, zinc: { @@ -185,11 +135,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - special: { - create: { - hasCrushedOre: true - } } }, cobalt: { From bb3cc19504db250694e9f206e6601e6366c7e6ca Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Wed, 23 Nov 2022 18:07:57 +0100 Subject: [PATCH 11/38] Another try at fixing random tags errors --- .../base/tags/items/enigmatica/storage/bags.js | 11 +++++++---- .../base/tags/items/enigmatica/storage/basic.js | 11 +++++++---- .../base/tags/items/enigmatica/storage/bulk.js | 11 +++++++---- .../base/tags/items/enigmatica/storage/energy.js | 11 +++++++---- .../base/tags/items/enigmatica/storage/gases.js | 11 +++++++---- .../base/tags/items/enigmatica/storage/liquids.js | 12 ++++++++---- .../base/tags/items/enigmatica/weapons/melee.js | 11 +++++++---- .../base/tags/items/enigmatica/weapons/ranged.js | 11 +++++++---- .../base/tags/items/forge/armor/boots.js | 11 +++++++---- .../base/tags/items/forge/armor/chests.js | 11 +++++++---- .../base/tags/items/forge/armor/helms.js | 11 +++++++---- .../base/tags/items/forge/armor/legs.js | 11 +++++++---- .../base/tags/items/forge/tools/axes.js | 12 ++++++++---- .../base/tags/items/forge/tools/bows.js | 12 ++++++++---- .../base/tags/items/forge/tools/crafting_hammers.js | 11 +++++++---- .../base/tags/items/forge/tools/fishing_rods.js | 12 ++++++++---- .../base/tags/items/forge/tools/hammers.js | 12 ++++++++---- .../base/tags/items/forge/tools/hoes.js | 12 ++++++++---- .../base/tags/items/forge/tools/knives.js | 13 +++++++++---- .../base/tags/items/forge/tools/multi-tools.js | 12 ++++++++---- .../base/tags/items/forge/tools/pickaxes.js | 13 +++++++++---- .../base/tags/items/forge/tools/shields.js | 12 ++++++++---- .../base/tags/items/forge/tools/shovels.js | 12 ++++++++---- .../base/tags/items/forge/tools/swords.js | 10 +++++++--- .../base/tags/items/forge/tools/tridents.js | 12 ++++++++---- 25 files changed, 189 insertions(+), 99 deletions(-) diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/storage/bags.js b/kubejs/server_scripts/base/tags/items/enigmatica/storage/bags.js index 29de973bd..a17ff7b2d 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/storage/bags.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/storage/bags.js @@ -15,9 +15,12 @@ ServerEvents.tags('item', (event) => { '#create:toolboxes' ]; - const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bag']; + // const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bag']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items); + // }); + + event.get('enigmatica:containers').add(items); + event.get('enigmatica:containers/bags').add(items); }); diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/storage/basic.js b/kubejs/server_scripts/base/tags/items/enigmatica/storage/basic.js index f56476497..ba3cb28db 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/storage/basic.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/storage/basic.js @@ -25,9 +25,12 @@ ServerEvents.tags('item', (event) => { 'immersiveengineering:armor_faraday_chest' ]; - const tagGroups = ['enigmatica:containers', 'enigmatica:containers/basic']; + // const tagGroups = ['enigmatica:containers', 'enigmatica:containers/basic']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('enigmatica:containers').add(items).remove(exceptions); + event.get('enigmatica:containers/basic').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/storage/bulk.js b/kubejs/server_scripts/base/tags/items/enigmatica/storage/bulk.js index fd6c06fa3..1749abcda 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/storage/bulk.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/storage/bulk.js @@ -11,9 +11,12 @@ ServerEvents.tags('item', (event) => { //'botania:black_hole_talisman' ]; - const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bulk']; + // const tagGroups = ['enigmatica:containers', 'enigmatica:containers/bulk']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items); + // }); + + event.get('enigmatica:containers').add(items); + event.get('enigmatica:containers/bulk').add(items); }); diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js b/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js index 19aa05026..96c921b83 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js @@ -9,9 +9,12 @@ ServerEvents.tags('item', (event) => { 'mekanism:energy_tablet' ]; - const tagGroups = ['enigmatica:containers', 'enigmatica:containers/energy']; + // const tagGroups = ['enigmatica:containers', 'enigmatica:containers/energy']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items); + // }); + + event.get('enigmatica:containers').add(items); + event.get('enigmatica:containers/energy').add(items); }); diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/storage/gases.js b/kubejs/server_scripts/base/tags/items/enigmatica/storage/gases.js index e2a324849..c7e093351 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/storage/gases.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/storage/gases.js @@ -1,9 +1,12 @@ ServerEvents.tags('item', (event) => { const items = [/chemical_tank/, /chemical_storage_cell/, 'mekanism:dynamic_tank', 'mekanism:dynamic_valve']; - const tagGroups = ['enigmatica:containers', 'enigmatica:containers/gas']; + // const tagGroups = ['enigmatica:containers', 'enigmatica:containers/gas']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items); + // }); + + event.get('enigmatica:containers').add(items); + event.get('enigmatica:containers/gas').add(items); }); diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/storage/liquids.js b/kubejs/server_scripts/base/tags/items/enigmatica/storage/liquids.js index 6c380cb07..5e7bbb9a2 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/storage/liquids.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/storage/liquids.js @@ -19,9 +19,13 @@ ServerEvents.tags('item', (event) => { 'mekanism:ultimate_chemical_tank', 'mekanism:creative_chemical_tank' ]; - const tagGroups = ['enigmatica:containers', 'enigmatica:containers/liquid', 'enigmatica:containers/fluid']; + // const tagGroups = ['enigmatica:containers', 'enigmatica:containers/liquid', 'enigmatica:containers/fluid']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('enigmatica:containers').add(items).remove(exceptions); + event.get('enigmatica:containers/liquid').add(items).remove(exceptions); + event.get('enigmatica:containers/fluid').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/weapons/melee.js b/kubejs/server_scripts/base/tags/items/enigmatica/weapons/melee.js index 3c91d75c7..00ce4a233 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/weapons/melee.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/weapons/melee.js @@ -15,9 +15,12 @@ ServerEvents.tags('item', (event) => { ]; const exceptions = []; - const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/melee']; + // const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/melee']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('enigmatica:weapons').add(items).remove(exceptions); + event.get('enigmatica:weapons/melee').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/weapons/ranged.js b/kubejs/server_scripts/base/tags/items/enigmatica/weapons/ranged.js index 56a31247d..f4dd29282 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/weapons/ranged.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/weapons/ranged.js @@ -21,9 +21,12 @@ ServerEvents.tags('item', (event) => { ]; const exceptions = []; - const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/ranged']; + // const tagGroups = ['enigmatica:weapons', 'enigmatica:weapons/ranged']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('enigmatica:weapons').add(items).remove(exceptions); + event.get('enigmatica:weapons/ranged').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/armor/boots.js b/kubejs/server_scripts/base/tags/items/forge/armor/boots.js index dcbde0dbd..a35eb23c0 100644 --- a/kubejs/server_scripts/base/tags/items/forge/armor/boots.js +++ b/kubejs/server_scripts/base/tags/items/forge/armor/boots.js @@ -15,9 +15,12 @@ ServerEvents.tags('item', (event) => { 'pneumaticcraft:jet_boots_upgrade_5' ]; - const tagGroups = ['forge:armors', 'forge:armors/boots']; + // const tagGroups = ['forge:armors', 'forge:armors/boots']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:armors').add(items).remove(exceptions); + event.get('forge:armors/boots').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/armor/chests.js b/kubejs/server_scripts/base/tags/items/forge/armor/chests.js index bebbb5918..1b7e9b095 100644 --- a/kubejs/server_scripts/base/tags/items/forge/armor/chests.js +++ b/kubejs/server_scripts/base/tags/items/forge/armor/chests.js @@ -16,9 +16,12 @@ ServerEvents.tags('item', (event) => { const exceptions = ['pneumaticcraft:jet_boots_upgrade_1']; - const tagGroups = ['forge:armors', 'forge:armors/chestplates']; + // const tagGroups = ['forge:armors', 'forge:armors/chestplates']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:armors').add(items).remove(exceptions); + event.get('forge:armors/chestplates').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/armor/helms.js b/kubejs/server_scripts/base/tags/items/forge/armor/helms.js index bc6db6617..4f53c96fe 100644 --- a/kubejs/server_scripts/base/tags/items/forge/armor/helms.js +++ b/kubejs/server_scripts/base/tags/items/forge/armor/helms.js @@ -12,9 +12,12 @@ ServerEvents.tags('item', (event) => { const exceptions = []; - const tagGroups = ['forge:armors', 'forge:armors/helmets']; + // const tagGroups = ['forge:armors', 'forge:armors/helmets']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:armors').add(items).remove(exceptions); + event.get('forge:armors/helmets').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/armor/legs.js b/kubejs/server_scripts/base/tags/items/forge/armor/legs.js index 8d97ecf4c..c90f2cb09 100644 --- a/kubejs/server_scripts/base/tags/items/forge/armor/legs.js +++ b/kubejs/server_scripts/base/tags/items/forge/armor/legs.js @@ -11,9 +11,12 @@ ServerEvents.tags('item', (event) => { const exceptions = []; - const tagGroups = ['forge:armors', 'forge:armors/leggings']; + // const tagGroups = ['forge:armors', 'forge:armors/leggings']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:armors').add(items).remove(exceptions); + event.get('forge:armors/leggings').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/axes.js b/kubejs/server_scripts/base/tags/items/forge/tools/axes.js index c442d3aba..af3a1d071 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/axes.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/axes.js @@ -2,9 +2,13 @@ ServerEvents.tags('item', (event) => { const items = [/_axe$/, /_paxel/, /_aiot/, 'immersiveengineering:axe_steel']; const exceptions = []; - const tagGroups = ['forge:tools', 'forge:axes', 'forge:tools/axes']; + // const tagGroups = ['forge:tools', 'forge:axes', 'forge:tools/axes']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/axes').add(items).remove(exceptions); + event.get('forge:axes').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/bows.js b/kubejs/server_scripts/base/tags/items/forge/tools/bows.js index 5492cf081..d5ce5a7a4 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/bows.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/bows.js @@ -2,9 +2,13 @@ ServerEvents.tags('item', (event) => { const items = [/_bow$/]; const exceptions = []; - const tagGroups = ['forge:tools', 'forge:bows', 'forge:tools/bows']; + // const tagGroups = ['forge:tools', 'forge:bows', 'forge:tools/bows']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/bows').add(items).remove(exceptions); + event.get('forge:bows').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js index 477f27f7c..e3965214a 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js @@ -2,9 +2,12 @@ ServerEvents.tags('item', (event) => { const items = ['immersiveengineering:hammer']; const exceptions = []; - const tagGroups = ['forge:tools', 'forge:tools/crafting_hammers']; + // const tagGroups = ['forge:tools', 'forge:tools/crafting_hammers']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/crafting_hammers').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/fishing_rods.js b/kubejs/server_scripts/base/tags/items/forge/tools/fishing_rods.js index 08d366787..bddaf4050 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/fishing_rods.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/fishing_rods.js @@ -3,9 +3,13 @@ ServerEvents.tags('item', (event) => { const exceptions = []; - const tagGroups = ['forge:tools', 'forge:fishing_rods', 'forge:tools/fishing_rods']; + // const tagGroups = ['forge:tools', 'forge:fishing_rods', 'forge:tools/fishing_rods']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/fishing_rods').add(items).remove(exceptions); + event.get('forge:fishing_rods').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/hammers.js b/kubejs/server_scripts/base/tags/items/forge/tools/hammers.js index 58194fbba..cca8202a7 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/hammers.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/hammers.js @@ -3,9 +3,13 @@ ServerEvents.tags('item', (event) => { const exceptions = ['immersiveengineering:gunpart_hammer', 'immersiveengineering:bannerpattern_hammer']; - const tagGroups = ['forge:tools', 'forge:hammers', 'forge:tools/hammers']; + // const tagGroups = ['forge:tools', 'forge:hammers', 'forge:tools/hammers']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/hammers').add(items).remove(exceptions); + event.get('forge:hammers').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/hoes.js b/kubejs/server_scripts/base/tags/items/forge/tools/hoes.js index 6c51a67ee..c967a15cb 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/hoes.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/hoes.js @@ -2,9 +2,13 @@ ServerEvents.tags('item', (event) => { const items = [/_hoe/, /_aiot/, 'immersiveengineering:hoe_steel']; const exceptions = []; - const tagGroups = ['forge:tools', 'forge:hoes', 'forge:tools/hoes']; + // const tagGroups = ['forge:tools', 'forge:hoes', 'forge:tools/hoes']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/hoes').add(items).remove(exceptions); + event.get('forge:hoes').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/knives.js b/kubejs/server_scripts/base/tags/items/forge/tools/knives.js index b67a73448..a65af093a 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/knives.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/knives.js @@ -3,9 +3,14 @@ ServerEvents.tags('item', (event) => { const exceptions = []; - const tagGroups = ['forge:tools', 'forge:knives', 'farmersdelight:tools/knives', 'farmersdelight:straw_harvesters']; + // const tagGroups = ['forge:tools', 'forge:knives', 'farmersdelight:tools/knives', 'farmersdelight:straw_harvesters']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:knives').add(items).remove(exceptions); + event.get('farmersdelight:tools/knives').add(items).remove(exceptions); + event.get('farmersdelight:straw_harvesters').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/multi-tools.js b/kubejs/server_scripts/base/tags/items/forge/tools/multi-tools.js index 9497e2b76..dbe92d052 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/multi-tools.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/multi-tools.js @@ -16,9 +16,13 @@ ServerEvents.tags('item', (event) => { const exceptions = []; - const tagGroups = ['forge:tools', 'forge:multi_tools', 'forge:tools/multi_tools']; + // const tagGroups = ['forge:tools', 'forge:multi_tools', 'forge:tools/multi_tools']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/multi_tools').add(items).remove(exceptions); + event.get('forge:multi_tools').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/pickaxes.js b/kubejs/server_scripts/base/tags/items/forge/tools/pickaxes.js index 5c17387ca..6a311d263 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/pickaxes.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/pickaxes.js @@ -3,9 +3,14 @@ ServerEvents.tags('item', (event) => { const exceptions = ['occultism:ritual_dummy/craft_infused_pickaxe']; - const tagGroups = ['minecraft:cluster_max_harvestables', 'forge:tools', 'forge:pickaxes', 'forge:tools/pickaxes']; + // const tagGroups = ['minecraft:cluster_max_harvestables', 'forge:tools', 'forge:pickaxes', 'forge:tools/pickaxes']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/pickaxes').add(items).remove(exceptions); + event.get('forge:pickaxes').add(items).remove(exceptions); + event.get('minecraft:cluster_max_harvestables').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/shields.js b/kubejs/server_scripts/base/tags/items/forge/tools/shields.js index 1c12bc498..659133698 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/shields.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/shields.js @@ -12,9 +12,13 @@ ServerEvents.tags('item', (event) => { const exceptions = ['twilightforest:stronghold_shield']; - const tagGroups = ['forge:tools', 'forge:shields', 'forge:tools/shields']; + // const tagGroups = ['forge:tools', 'forge:shields', 'forge:tools/shields']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/shields').add(items).remove(exceptions); + event.get('forge:shields').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/shovels.js b/kubejs/server_scripts/base/tags/items/forge/tools/shovels.js index 8cfe3cda5..dd97eb692 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/shovels.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/shovels.js @@ -2,9 +2,13 @@ ServerEvents.tags('item', (event) => { const items = [/_shovel$/, /_aiot/, /_paxel/, /_excavator/, 'immersiveengineering:shovel_steel']; const exceptions = []; - const tagGroups = ['forge:tools', 'forge:shovels', 'forge:tools/shovels']; + // const tagGroups = ['forge:tools', 'forge:shovels', 'forge:tools/shovels']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/shovels').add(items).remove(exceptions); + event.get('forge:shovels').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/swords.js b/kubejs/server_scripts/base/tags/items/forge/tools/swords.js index f2c6c45f9..6db4d63de 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/swords.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/swords.js @@ -4,7 +4,11 @@ ServerEvents.tags('item', (event) => { const tagGroups = ['forge:tools', 'forge:swords', 'forge:tools/swords']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/swords').add(items).remove(exceptions); + event.get('forge:swords').add(items).remove(exceptions); }); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/tridents.js b/kubejs/server_scripts/base/tags/items/forge/tools/tridents.js index d6d27ba8d..38a29e1c4 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/tridents.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/tridents.js @@ -3,9 +3,13 @@ ServerEvents.tags('item', (event) => { const exceptions = ['immersiveengineering:gunpart_hammer', 'immersiveengineering:bannerpattern_hammer']; - const tagGroups = ['forge:tools', 'forge:tridents', 'forge:tools/tridents']; + // const tagGroups = ['forge:tools', 'forge:tridents', 'forge:tools/tridents']; - tagGroups.forEach((tagGroup) => { - event.get(tagGroup).add(items).remove(exceptions); - }); + // tagGroups.forEach((tagGroup) => { + // event.get(tagGroup).add(items).remove(exceptions); + // }); + + event.get('forge:tools').add(items).remove(exceptions); + event.get('forge:tools/tridents').add(items).remove(exceptions); + event.get('forge:tridents').add(items).remove(exceptions); }); From 2b53efae6c8934f5c01e158c058458283cf1e620 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Nov 2022 17:24:41 +0000 Subject: [PATCH 12/38] Run prettier Co-authored-by: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> --- .../server_scripts/base/tags/items/enigmatica/storage/energy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js b/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js index 96c921b83..47f8452b2 100644 --- a/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js +++ b/kubejs/server_scripts/base/tags/items/enigmatica/storage/energy.js @@ -14,7 +14,7 @@ ServerEvents.tags('item', (event) => { // tagGroups.forEach((tagGroup) => { // event.get(tagGroup).add(items); // }); - + event.get('enigmatica:containers').add(items); event.get('enigmatica:containers/energy').add(items); }); From a01ec3c38d728f7989a536e7ef895e44012d54db Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Thu, 24 Nov 2022 13:57:49 +0100 Subject: [PATCH 13/38] Remove defautl mek ore processing --- kubejs/server_scripts/base/recipes/enigmatica/remove.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js index 1ab9a3562..d60b614ba 100644 --- a/kubejs/server_scripts/base/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/base/recipes/enigmatica/remove.js @@ -14,6 +14,9 @@ ServerEvents.recipes((event) => { { id: /mekanism:sawing\/log/ }, { id: /mekanism:compat\/byg\/combining\/.*_ore_/ }, { id: /mekanism:bin\/.*/ }, + { id: /mekanism:processing\/.*\/crystal\/from_slurry/}, + { id: /mekanism:processing\/.*\/slurry\/clean/}, + { id: /mekanism:processing\/.*\/slurry\/dirty\/from_ore/}, { id: 'quark:tweaks/smelting/bone_meal_utility' }, { type: 'immersiveengineering:sawmill' }, { type: 'create:cutting' }, From af3b0a196d4f61e2b0f85ced5bd21c3f615d3b2f Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Thu, 24 Nov 2022 14:02:32 +0100 Subject: [PATCH 14/38] Add scripts for hiding fluids / gases --- kubejs/client_scripts/base/jei_hide_fluids.js | 5 +++++ kubejs/client_scripts/base/jei_hide_gases.js | 6 ++++++ .../client_scripts/constants/jei_hidden_disabled.js | 13 ++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 kubejs/client_scripts/base/jei_hide_fluids.js create mode 100644 kubejs/client_scripts/base/jei_hide_gases.js diff --git a/kubejs/client_scripts/base/jei_hide_fluids.js b/kubejs/client_scripts/base/jei_hide_fluids.js new file mode 100644 index 000000000..49b0b7eb7 --- /dev/null +++ b/kubejs/client_scripts/base/jei_hide_fluids.js @@ -0,0 +1,5 @@ +JEIEvents.hideFluids((event) => { + jei.base.fluids.hidden.forEach((hiddenFluid) => { + event.hide(hiddenFluid); + }); +}); diff --git a/kubejs/client_scripts/base/jei_hide_gases.js b/kubejs/client_scripts/base/jei_hide_gases.js new file mode 100644 index 000000000..e734d4a07 --- /dev/null +++ b/kubejs/client_scripts/base/jei_hide_gases.js @@ -0,0 +1,6 @@ +const MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI') +JEIEvents.hideCustom(event => { + jei.base.gases.hidden.forEach((hiddenGas) => { + event.get(MekanismJEI.TYPE_GAS).hide(hiddenGas) + }); +}); \ No newline at end of file diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js index d00f7e47b..756361b1c 100644 --- a/kubejs/client_scripts/constants/jei_hidden_disabled.js +++ b/kubejs/client_scripts/constants/jei_hidden_disabled.js @@ -6,9 +6,9 @@ const disabled_item_message = const disabled_item_tooltip = 'This item has been disabled.'; const jei = { - base: { items: { hidden: [], disabled: [] }, categories: { hidden: [] } }, - normal: { items: { hidden: [], disabled: [] }, categories: { hidden: [] } }, - expert: { items: { hidden: [], disabled: [] }, categories: { hidden: [] } } + base: { items: { hidden: [], disabled: [] }, categories: { hidden: [] }, fluids: { hidden: [] }, gases: { hidden: [] }}, + normal: { items: { hidden: [], disabled: [] }, categories: { hidden: [] }, fluids: { hidden: [] }, gases: { hidden: [] }}, + expert: { items: { hidden: [], disabled: [] }, categories: { hidden: [] }, fluids: { hidden: [] }, gases: { hidden: [] }} }; // Base jei.base.items.disabled = [ @@ -76,12 +76,19 @@ jei.base.items.hidden = [ ]; jei.base.categories.hidden = ['twilightforest:uncrafting']; +jei.base.fluids.hidden = [] +jei.base.gases.hidden = [] + // Normal jei.normal.items.disabled = []; jei.normal.items.hidden = []; jei.normal.categories.hidden = []; +jei.normal.fluids.hidden = []; +jei.normal.gases.hidden = []; // Expert jei.expert.items.disabled = []; jei.expert.items.hidden = []; jei.expert.categories.hidden = []; +jei.expert.fluids.hidden = []; +jei.expert.gases.hidden = []; From 93a2b46052ab705ebfbadaf88095ad35aaf3e0de Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 17:30:26 +0100 Subject: [PATCH 15/38] Update remove.js --- kubejs/server_scripts/base/recipes/enigmatica/remove.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js index d60b614ba..f280b37b9 100644 --- a/kubejs/server_scripts/base/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/base/recipes/enigmatica/remove.js @@ -16,7 +16,7 @@ ServerEvents.recipes((event) => { { id: /mekanism:bin\/.*/ }, { id: /mekanism:processing\/.*\/crystal\/from_slurry/}, { id: /mekanism:processing\/.*\/slurry\/clean/}, - { id: /mekanism:processing\/.*\/slurry\/dirty\/from_ore/}, + { id: /mekanism:processing\/.*\/slurry\/dirty/}, { id: 'quark:tweaks/smelting/bone_meal_utility' }, { type: 'immersiveengineering:sawmill' }, { type: 'create:cutting' }, From fb4de178460dfc44415fb2cc668ff39a404f2598 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 17:44:26 +0100 Subject: [PATCH 16/38] Fix hiding Gasses/slurries in JEI --- kubejs/client_scripts/base/jei_hide_gases.js | 2 +- kubejs/client_scripts/base/jei_hide_slurries.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 kubejs/client_scripts/base/jei_hide_slurries.js diff --git a/kubejs/client_scripts/base/jei_hide_gases.js b/kubejs/client_scripts/base/jei_hide_gases.js index e734d4a07..966292ec1 100644 --- a/kubejs/client_scripts/base/jei_hide_gases.js +++ b/kubejs/client_scripts/base/jei_hide_gases.js @@ -1,4 +1,4 @@ -const MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI') +let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI') JEIEvents.hideCustom(event => { jei.base.gases.hidden.forEach((hiddenGas) => { event.get(MekanismJEI.TYPE_GAS).hide(hiddenGas) diff --git a/kubejs/client_scripts/base/jei_hide_slurries.js b/kubejs/client_scripts/base/jei_hide_slurries.js new file mode 100644 index 000000000..b8b2beddc --- /dev/null +++ b/kubejs/client_scripts/base/jei_hide_slurries.js @@ -0,0 +1,9 @@ +let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI') +JEIEvents.hideCustom(event => { + + const slurries = [/mekanism:clean_/, /mekanism:dirty_/] + + slurries.forEach((hiddenSlurry) => { + event.get(MekanismJEI.TYPE_SLURRY).hide(hiddenSlurry); + }); +}); \ No newline at end of file From b7af2c708e7a31b8ea64a58230cdd736d88fd52b Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 17:50:53 +0100 Subject: [PATCH 17/38] Hide Mek creative fluid / gas tanks from JEI --- kubejs/client_scripts/constants/jei_hidden_disabled.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js index 756361b1c..a26cd7b1c 100644 --- a/kubejs/client_scripts/constants/jei_hidden_disabled.js +++ b/kubejs/client_scripts/constants/jei_hidden_disabled.js @@ -72,7 +72,9 @@ jei.base.items.hidden = [ 'twilightforest:ur_ghast_boss_spawner', 'twilightforest:knight_phantom_boss_spawner', 'twilightforest:minoshroom_boss_spawner', - 'twilightforest:lich_boss_spawner' + 'twilightforest:lich_boss_spawner', + 'mekanism:creative_fluid_tank', + 'mekanism:creative_chemical_tank' ]; jei.base.categories.hidden = ['twilightforest:uncrafting']; From 4bc80b9ba07316a7af8e1769a9e331a812f90d96 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 22:37:20 +0100 Subject: [PATCH 18/38] Add back again crushed_ores.js, as yeeting Default ones is more difficult than we thought >.> --- .../base/tags/items/create/crushed_ores.js | 11 ++ .../constants/metal_properties.js | 105 ++++++++++++------ 2 files changed, 80 insertions(+), 36 deletions(-) create mode 100644 kubejs/server_scripts/base/tags/items/create/crushed_ores.js diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js new file mode 100644 index 000000000..89ccd739d --- /dev/null +++ b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js @@ -0,0 +1,11 @@ +ServerEvents.tags("item", (event) => { + let props = Object.keys(metal_properties); + + props.forEach((metal) => { + if(metal_properties[metal].create) { + if (metal_properties[metal].create.crushedOre) { + event.get(`create:crushed_ores/${metal}`).add(`create:crushed_${metal}_ore`) + } + } + }); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/constants/metal_properties.js b/kubejs/server_scripts/constants/metal_properties.js index 5e3806a62..525d86e73 100644 --- a/kubejs/server_scripts/constants/metal_properties.js +++ b/kubejs/server_scripts/constants/metal_properties.js @@ -15,6 +15,9 @@ const metal_properties = { create: { processingTime: 400 } + }, + create: { + crushedOre: true } }, nickel: { @@ -27,6 +30,9 @@ const metal_properties = { create: { processingTime: 350 } + }, + create: { + crushedOre: true } }, gold: { @@ -39,6 +45,9 @@ const metal_properties = { create: { processingTime: 300 } + }, + create: { + crushedOre: true } }, copper: { @@ -51,6 +60,9 @@ const metal_properties = { create: { processingTime: 350 } + }, + create: { + crushedOre: true } }, aluminum: { @@ -63,6 +75,9 @@ const metal_properties = { create: { processingTime: 300 } + }, + create: { + crushedOre: true } }, lead: { @@ -75,6 +90,9 @@ const metal_properties = { create: { processingTime: 300 } + }, + create: { + crushedOre: true } }, silver: { @@ -87,6 +105,9 @@ const metal_properties = { create: { processingTime: 300 } + }, + create: { + crushedOre: true } }, uranium: { @@ -99,6 +120,9 @@ const metal_properties = { create: { processingTime: 400 } + }, + create: { + crushedOre: true } }, osmium: { @@ -111,6 +135,9 @@ const metal_properties = { create: { processingTime: 400 } + }, + create: { + crushedOre: true } }, tin: { @@ -123,6 +150,9 @@ const metal_properties = { create: { processingTime: 350 } + }, + create: { + crushedOre: true } }, zinc: { @@ -135,20 +165,23 @@ const metal_properties = { create: { processingTime: 350 } + }, + create: { + crushedOre: true } }, - cobalt: { - meltingPoint: 950, - oreProcessing: { - output: { - substrate: 'minecraft:netherrack', - secondary: 'iron' - }, - create: { - processingTime: 400 - } - } - }, + // cobalt: { + // meltingPoint: 950, + // oreProcessing: { + // output: { + // substrate: 'minecraft:netherrack', + // secondary: 'iron' + // }, + // create: { + // processingTime: 400 + // } + // } + // }, iesnium: { meltingPoint: 850, oreProcessing: { @@ -161,33 +194,33 @@ const metal_properties = { } } }, - elementium: { - meltingPoint: 875 - }, - enderium: { - meltingPoint: 1450 - }, - signalum: { - meltingPoint: 1272 - }, - lumium: { - meltingPoint: 1354 - }, - manasteel: { - meltingPoint: 900 - }, - terrasteel: { - meltingPoint: 1350 - }, - gaia_spirit: { - meltingPoint: 975 - }, + // elementium: { + // meltingPoint: 875 + // }, + // enderium: { + // meltingPoint: 1450 + // }, + // signalum: { + // meltingPoint: 1272 + // }, + // lumium: { + // meltingPoint: 1354 + // }, + // manasteel: { + // meltingPoint: 900 + // }, + // terrasteel: { + // meltingPoint: 1350 + // }, + // gaia_spirit: { + // meltingPoint: 975 + // }, infused_iron: { meltingPoint: 850 }, - sky_metal: { - meltingPoint: 950 - }, + // sky_metal: { + // meltingPoint: 950 + // }, energized_steel: { meltingPoint: 875 } From f23fb6571557d35a377cdd6359634f2cbabde290 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 23:35:27 +0100 Subject: [PATCH 19/38] Rework crushed_ores.js once again. This time its the final rework ^^" Without any complications, flexible to what Create offers >.> --- .../base/tags/items/create/crushed_ores.js | 6 ++-- .../constants/metal_properties.js | 33 ------------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js index 89ccd739d..edbe9655d 100644 --- a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js +++ b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js @@ -2,10 +2,8 @@ ServerEvents.tags("item", (event) => { let props = Object.keys(metal_properties); props.forEach((metal) => { - if(metal_properties[metal].create) { - if (metal_properties[metal].create.crushedOre) { - event.get(`create:crushed_ores/${metal}`).add(`create:crushed_${metal}_ore`) - } + if (Item.exists(`create:crushed_${metal}_ore`)) { + event.get(`create:crushed_ores/${metal}`).add(`create:crushed_${metal}_ore`) } }); }); \ No newline at end of file diff --git a/kubejs/server_scripts/constants/metal_properties.js b/kubejs/server_scripts/constants/metal_properties.js index 525d86e73..cf99f0759 100644 --- a/kubejs/server_scripts/constants/metal_properties.js +++ b/kubejs/server_scripts/constants/metal_properties.js @@ -15,9 +15,6 @@ const metal_properties = { create: { processingTime: 400 } - }, - create: { - crushedOre: true } }, nickel: { @@ -30,9 +27,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - create: { - crushedOre: true } }, gold: { @@ -45,9 +39,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - create: { - crushedOre: true } }, copper: { @@ -60,9 +51,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - create: { - crushedOre: true } }, aluminum: { @@ -75,9 +63,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - create: { - crushedOre: true } }, lead: { @@ -90,9 +75,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - create: { - crushedOre: true } }, silver: { @@ -105,9 +87,6 @@ const metal_properties = { create: { processingTime: 300 } - }, - create: { - crushedOre: true } }, uranium: { @@ -120,9 +99,6 @@ const metal_properties = { create: { processingTime: 400 } - }, - create: { - crushedOre: true } }, osmium: { @@ -135,9 +111,6 @@ const metal_properties = { create: { processingTime: 400 } - }, - create: { - crushedOre: true } }, tin: { @@ -150,9 +123,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - create: { - crushedOre: true } }, zinc: { @@ -165,9 +135,6 @@ const metal_properties = { create: { processingTime: 350 } - }, - create: { - crushedOre: true } }, // cobalt: { From 4b08f0d97226b7cf85aa09dd25fd1f45dbdc0c01 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 23:35:34 +0100 Subject: [PATCH 20/38] Update remove.js --- kubejs/server_scripts/base/recipes/enigmatica/remove.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js index f280b37b9..38ba252af 100644 --- a/kubejs/server_scripts/base/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/base/recipes/enigmatica/remove.js @@ -17,7 +17,7 @@ ServerEvents.recipes((event) => { { id: /mekanism:processing\/.*\/crystal\/from_slurry/}, { id: /mekanism:processing\/.*\/slurry\/clean/}, { id: /mekanism:processing\/.*\/slurry\/dirty/}, - { id: 'quark:tweaks/smelting/bone_meal_utility' }, + { id: 'quark:tweaks/smelting/bone_meal_utility'}, { type: 'immersiveengineering:sawmill' }, { type: 'create:cutting' }, { type: 'immersiveengineering:cloche' }, From 7cb86f659ce73302ce40ac5807dce78285e99a0a Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 23:40:53 +0100 Subject: [PATCH 21/38] Create rods.js --- .../base/recipes/emendatusenigmatica/rods.js | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js new file mode 100644 index 000000000..128d60d83 --- /dev/null +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js @@ -0,0 +1,54 @@ +ServerEvents.recipes((event) => { + const recipes = [ + // { + // output: 'minecraft:diamond', + // pattern: ['ABA', 'B B', 'ABA'], + // key: { + // A: '#forge:storage_blocks/coal', + // B: '#forge:gems/coal' + // }, + // id: `enigmatica:diamond_from_coal` + // } + ]; + + const recipes_to_remove = [ + // { + // input: 'sample', + // output: 'sample', + // type: 'sample', + // mod: 'sample', + // id: 'sample' + // } + ] + + let props = Object.keys(metal_properties); + props.forEach((metal) => { + if (Item.exists(`emendatusenigmatica:${metal}_rod`)) { + recipes.push( + { + output: Item.of(`emendatusenigmatica:${metal}_rod`,4), + pattern: [' A ', ' A '], + key: { + A: `#forge:ingots/${metal}`, + }, + id: `emendatusenigmatica:rod/from_ingot/${metal}` + } + ) + // Remove other recipes + // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> + if (Item.exists(`immersiveengineering:stick_${metal}`)) { + recipes_to_remove.push({ + id: `immersiveengineering:crafting/stick_${metal}` + }) + } + } + }) + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); + + recipes_to_remove.forEach((recipe) => { + event.remove(recipe) + }) +}); From 22901d7111773ca6961eddc056616e56824dc7d6 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 23:51:53 +0100 Subject: [PATCH 22/38] Add EE hammer to crafting hammers tag --- .../base/tags/items/forge/tools/crafting_hammers.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js index 477f27f7c..2dce25ecb 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js @@ -1,5 +1,8 @@ ServerEvents.tags('item', (event) => { - const items = ['immersiveengineering:hammer']; + const items = [ + 'immersiveengineering:hammer', + 'emendatusenigmatica:enigmatic_hammer' + ]; const exceptions = []; const tagGroups = ['forge:tools', 'forge:tools/crafting_hammers']; From 272ca1502b1f5b914aa38574a359e0770fc8baf5 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sat, 26 Nov 2022 23:57:22 +0100 Subject: [PATCH 23/38] More EE Unification setup --- .../base/recipes/emendatusenigmatica/gears.js | 45 +++++++++++++++++++ .../base/recipes/emendatusenigmatica/rods.js | 1 + 2 files changed, 46 insertions(+) create mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js new file mode 100644 index 000000000..c9842dd1a --- /dev/null +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js @@ -0,0 +1,45 @@ +ServerEvents.recipes((event) => { + const recipes = [ + // { + // output: 'minecraft:diamond', + // pattern: ['ABA', 'B B', 'ABA'], + // key: { + // A: '#forge:storage_blocks/coal', + // B: '#forge:gems/coal' + // }, + // id: `enigmatica:diamond_from_coal` + // } + ]; + + const recipes_to_remove = [ + // { + // input: 'sample', + // output: 'sample', + // type: 'sample', + // mod: 'sample', + // id: 'sample' + // } + ] + + let props = Object.keys(metal_properties); + props.forEach((metal) => { + if (Item.exists(`emendatusenigmatica:${metal}_gear`)) { + // Remove other recipes + // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> + // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" + if (Item.exists(`industrialforegoing:${metal}_gear`)) { + recipes_to_remove.push({ + id: `industrialforegoing:${metal}_gear` + }) + } + } + }) + + recipes.forEach((recipe) => { + event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); + }); + + recipes_to_remove.forEach((recipe) => { + event.remove(recipe) + }) +}); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js index 128d60d83..f19961082 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js @@ -36,6 +36,7 @@ ServerEvents.recipes((event) => { ) // Remove other recipes // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> + // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" if (Item.exists(`immersiveengineering:stick_${metal}`)) { recipes_to_remove.push({ id: `immersiveengineering:crafting/stick_${metal}` From 02696ca1023e59d5fc0ffde3c623c6f98a3e155d Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:06:18 +0100 Subject: [PATCH 24/38] Remove examples / Add plates.js --- .../base/recipes/emendatusenigmatica/gears.js | 23 ++---------- .../recipes/emendatusenigmatica/plates.js | 37 +++++++++++++++++++ .../base/recipes/emendatusenigmatica/rods.js | 23 ++---------- 3 files changed, 43 insertions(+), 40 deletions(-) create mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js index c9842dd1a..a2215ff78 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js @@ -1,27 +1,10 @@ ServerEvents.recipes((event) => { - const recipes = [ - // { - // output: 'minecraft:diamond', - // pattern: ['ABA', 'B B', 'ABA'], - // key: { - // A: '#forge:storage_blocks/coal', - // B: '#forge:gems/coal' - // }, - // id: `enigmatica:diamond_from_coal` - // } - ]; + const recipes = []; - const recipes_to_remove = [ - // { - // input: 'sample', - // output: 'sample', - // type: 'sample', - // mod: 'sample', - // id: 'sample' - // } - ] + const recipes_to_remove = [] let props = Object.keys(metal_properties); + props.forEach((metal) => { if (Item.exists(`emendatusenigmatica:${metal}_gear`)) { // Remove other recipes diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js new file mode 100644 index 000000000..318dad199 --- /dev/null +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js @@ -0,0 +1,37 @@ +ServerEvents.recipes((event) => { + const recipes = []; + + const recipes_to_remove = [] + + const exceptions = [ + 'brass' + ] + + let props = Object.keys(metal_properties); + + props.forEach((metal) => { + if (Item.exists(`emendatusenigmatica:${metal}_plate`)) { + recipes.push({ + output: `emendatusenigmatica:${metal}_plate`, + inputs: [`#forge:plates/${metal}`, '#forge:tools/crafting_hammers'], + id: `emendatusenigmatica:plate/from_ingot/${metal}` + }) + // Remove other recipes + // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> + // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" + if (!exceptions.includes(metal)) { + recipes_to_remove.push({ + id: `immersiveengineering:crafting/plate_${metal}_hammering` + }) + } + } + }) + + recipes.forEach((recipe) => { + event.shapeless(recipe.output, recipe.inputs).id(recipe.id); + }); + + recipes_to_remove.forEach((recipe) => { + event.remove(recipe) + }) +}); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js index f19961082..f23847e59 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js @@ -1,27 +1,10 @@ ServerEvents.recipes((event) => { - const recipes = [ - // { - // output: 'minecraft:diamond', - // pattern: ['ABA', 'B B', 'ABA'], - // key: { - // A: '#forge:storage_blocks/coal', - // B: '#forge:gems/coal' - // }, - // id: `enigmatica:diamond_from_coal` - // } - ]; + const recipes = []; - const recipes_to_remove = [ - // { - // input: 'sample', - // output: 'sample', - // type: 'sample', - // mod: 'sample', - // id: 'sample' - // } - ] + const recipes_to_remove = [] let props = Object.keys(metal_properties); + props.forEach((metal) => { if (Item.exists(`emendatusenigmatica:${metal}_rod`)) { recipes.push( From 05fc62c271949c700560bc35bfc7be9b7588f427 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:11:52 +0100 Subject: [PATCH 25/38] Update plates.js --- .../server_scripts/base/recipes/emendatusenigmatica/plates.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js index 318dad199..67d12280d 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js @@ -8,12 +8,12 @@ ServerEvents.recipes((event) => { ] let props = Object.keys(metal_properties); - + props.forEach((metal) => { if (Item.exists(`emendatusenigmatica:${metal}_plate`)) { recipes.push({ output: `emendatusenigmatica:${metal}_plate`, - inputs: [`#forge:plates/${metal}`, '#forge:tools/crafting_hammers'], + inputs: [`#forge:ingots/${metal}`, '#forge:tools/crafting_hammers'], id: `emendatusenigmatica:plate/from_ingot/${metal}` }) // Remove other recipes From 42fb28872cd130797577c89036f01f3470544776 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:30:33 +0100 Subject: [PATCH 26/38] Disable combining ores from Mek --- kubejs/server_scripts/base/recipes/enigmatica/remove.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js index 38ba252af..5c931673f 100644 --- a/kubejs/server_scripts/base/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/base/recipes/enigmatica/remove.js @@ -14,6 +14,7 @@ ServerEvents.recipes((event) => { { id: /mekanism:sawing\/log/ }, { id: /mekanism:compat\/byg\/combining\/.*_ore_/ }, { id: /mekanism:bin\/.*/ }, + { id: /mekanism:processing\/.*\/to_ore/ }, { id: /mekanism:processing\/.*\/crystal\/from_slurry/}, { id: /mekanism:processing\/.*\/slurry\/clean/}, { id: /mekanism:processing\/.*\/slurry\/dirty/}, From 2a31ca825a5815b4f5bb21514eab614d43d7ca25 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:40:36 +0100 Subject: [PATCH 27/38] Update remove.js --- kubejs/server_scripts/base/recipes/enigmatica/remove.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js index 5c931673f..d1183d40b 100644 --- a/kubejs/server_scripts/base/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/base/recipes/enigmatica/remove.js @@ -14,10 +14,12 @@ ServerEvents.recipes((event) => { { id: /mekanism:sawing\/log/ }, { id: /mekanism:compat\/byg\/combining\/.*_ore_/ }, { id: /mekanism:bin\/.*/ }, - { id: /mekanism:processing\/.*\/to_ore/ }, + { id: /mekanism:processing\/.*\/to.*_ore/ }, + { id: /mekanism:processing\/.*\/ore\/.*from_raw/ }, { id: /mekanism:processing\/.*\/crystal\/from_slurry/}, { id: /mekanism:processing\/.*\/slurry\/clean/}, { id: /mekanism:processing\/.*\/slurry\/dirty/}, + { id: 'mekanism:processing/netherite/dust_to_ancient_debris' }, { id: 'quark:tweaks/smelting/bone_meal_utility'}, { type: 'immersiveengineering:sawmill' }, { type: 'create:cutting' }, From 4dbcc0ee3c507ef933ff0ddf67a1e4781a4c0764 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:46:55 +0100 Subject: [PATCH 28/38] Another part of EE Unification Modify EE recipes for dust from raw/ore to accept IE hammer Remove IE recipes for dust from raw/ore --- .../base/recipes/emendatusenigmatica/dusts.js | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js new file mode 100644 index 000000000..131123891 --- /dev/null +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js @@ -0,0 +1,43 @@ +ServerEvents.recipes((event) => { + const recipes = []; + + const recipes_to_remove = [] + + const exceptions = [] + + let props = Object.keys(metal_properties); + + props.forEach((metal) => { + if (Item.exists(`emendatusenigmatica:raw_${metal}`)) { + recipes.push({ + output: `emendatusenigmatica:${metal}_dust`, + inputs: [`#forge:raw_materials/${metal}`, '#forge:tools/crafting_hammers'], + id: `emendatusenigmatica:dust/from_raw/${metal}` + }, + { + output: `emendatusenigmatica:${metal}_dust`, + inputs: [`#forge:ores/${metal}`, '#forge:tools/crafting_hammers'], + id: `emendatusenigmatica:dust/from_ore/${metal}` + }) + // Remove other recipes + // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> + // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" + if (!exceptions.includes(metal)) { + recipes_to_remove.push({ + id: `immersiveengineering:crafting/raw_hammercrushing_${metal}` + }, + { + id: `immersiveengineering:crafting/hammercrushing_${metal}` + }) + } + } + }) + + recipes.forEach((recipe) => { + event.shapeless(recipe.output, recipe.inputs).id(recipe.id); + }); + + recipes_to_remove.forEach((recipe) => { + event.remove(recipe) + }) +}); From fdf0e8f493ab80894f955656579a5242c2af4458 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:55:25 +0100 Subject: [PATCH 29/38] EE Materials Part II --- .../emendatusenigmatica/material/copper.json | 11 ++++-- config/emendatusenigmatica/material/iron.json | 36 +++++++++++++++++++ .../base/tags/items/minecraft/copper_block.js | 3 ++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 config/emendatusenigmatica/material/iron.json create mode 100644 kubejs/server_scripts/base/tags/items/minecraft/copper_block.js diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json index c5b5c7fc1..1cca58922 100644 --- a/config/emendatusenigmatica/material/copper.json +++ b/config/emendatusenigmatica/material/copper.json @@ -2,6 +2,7 @@ "id": "copper", "source": "vanilla", "localizedName": "Copper", + "disableDefaultOre": true, "processedTypes": [ "storage_block", "ore", @@ -19,9 +20,15 @@ ], "properties": { "materialType": "metal", - "harvestLevel": 0 + "harvestLevel": 1 }, "colors": { - "materialColor": "c87456" + "materialColor": "c87456", + "fluidColor": "c87456" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_copper", + "min": 1, + "max": 1 } } \ No newline at end of file diff --git a/config/emendatusenigmatica/material/iron.json b/config/emendatusenigmatica/material/iron.json new file mode 100644 index 000000000..410d1a76e --- /dev/null +++ b/config/emendatusenigmatica/material/iron.json @@ -0,0 +1,36 @@ +{ + "id": "iron", + "source": "vanilla", + "localizedName": "Iron", + "disableDefaultOre": true, + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "rod", + "gear", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 1 + }, + "colors": { + "materialColor": "d8d8d8", + "fluidColor": "d8d8d8" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_iron", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/kubejs/server_scripts/base/tags/items/minecraft/copper_block.js b/kubejs/server_scripts/base/tags/items/minecraft/copper_block.js new file mode 100644 index 000000000..05a51c7a9 --- /dev/null +++ b/kubejs/server_scripts/base/tags/items/minecraft/copper_block.js @@ -0,0 +1,3 @@ +ServerEvents.tags('item', (event) => { + event.removeAllTagsFrom('minecraft:copper_block'); +}); From 04359c8e4dbae3c430d14db6fe1824e6fe31b600 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:55:41 +0100 Subject: [PATCH 30/38] Update unify.json --- config/almostunified/unify.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json index 7d78be4be..4051625e3 100644 --- a/config/almostunified/unify.json +++ b/config/almostunified/unify.json @@ -36,7 +36,8 @@ "mekanism:shards/{material}", "mekanism:clumps/{material}", "mekanism:dirty_dusts/{material}", - "mekanism:shards/{material}" + "mekanism:shards/{material}", + "create:crushed_ores/{material}" ], "materials": [ "aeternium", From 6f3e6a1129c9cf4a574d8ef4429703bffe6d62f1 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:56:22 +0100 Subject: [PATCH 31/38] Remove unwanted script from last commit ^^" --- .../server_scripts/base/tags/items/minecraft/copper_block.js | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 kubejs/server_scripts/base/tags/items/minecraft/copper_block.js diff --git a/kubejs/server_scripts/base/tags/items/minecraft/copper_block.js b/kubejs/server_scripts/base/tags/items/minecraft/copper_block.js deleted file mode 100644 index 05a51c7a9..000000000 --- a/kubejs/server_scripts/base/tags/items/minecraft/copper_block.js +++ /dev/null @@ -1,3 +0,0 @@ -ServerEvents.tags('item', (event) => { - event.removeAllTagsFrom('minecraft:copper_block'); -}); From 9dcd769280c1bcbcf07e5e7b088df86dbf33e3b0 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 10:08:06 +0100 Subject: [PATCH 32/38] Remove EE Copper Block in favor of vanilla one --- config/emendatusenigmatica/material/copper.json | 1 - 1 file changed, 1 deletion(-) diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json index 1cca58922..16084a518 100644 --- a/config/emendatusenigmatica/material/copper.json +++ b/config/emendatusenigmatica/material/copper.json @@ -4,7 +4,6 @@ "localizedName": "Copper", "disableDefaultOre": true, "processedTypes": [ - "storage_block", "ore", "raw", "crushed_ore", From bf75e2ec932a691cb0cddfaae73b7fd958c60e89 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 11:05:13 +0100 Subject: [PATCH 33/38] Add ore-based materials / Added basic Strata for testing --- .../material/aluminium.json | 34 ++++++++++++++++++ .../emendatusenigmatica/material/copper.json | 4 +-- config/emendatusenigmatica/material/gold.json | 35 +++++++++++++++++++ config/emendatusenigmatica/material/iron.json | 4 +-- config/emendatusenigmatica/material/lead.json | 33 +++++++++++++++++ .../emendatusenigmatica/material/nickel.json | 33 +++++++++++++++++ .../emendatusenigmatica/material/osmium.json | 32 +++++++++++++++++ .../emendatusenigmatica/material/silver.json | 33 +++++++++++++++++ config/emendatusenigmatica/material/tin.json | 32 +++++++++++++++++ .../emendatusenigmatica/material/uranium.json | 33 +++++++++++++++++ config/emendatusenigmatica/material/zinc.json | 32 +++++++++++++++++ .../emendatusenigmatica/strata/deepslate.json | 7 ++++ .../strata/netherrrack.json | 7 ++++ config/emendatusenigmatica/strata/stone.json | 7 ++++ 14 files changed, 322 insertions(+), 4 deletions(-) create mode 100644 config/emendatusenigmatica/material/aluminium.json create mode 100644 config/emendatusenigmatica/material/gold.json create mode 100644 config/emendatusenigmatica/material/lead.json create mode 100644 config/emendatusenigmatica/material/nickel.json create mode 100644 config/emendatusenigmatica/material/osmium.json create mode 100644 config/emendatusenigmatica/material/silver.json create mode 100644 config/emendatusenigmatica/material/tin.json create mode 100644 config/emendatusenigmatica/material/uranium.json create mode 100644 config/emendatusenigmatica/material/zinc.json create mode 100644 config/emendatusenigmatica/strata/deepslate.json create mode 100644 config/emendatusenigmatica/strata/netherrrack.json create mode 100644 config/emendatusenigmatica/strata/stone.json diff --git a/config/emendatusenigmatica/material/aluminium.json b/config/emendatusenigmatica/material/aluminium.json new file mode 100644 index 000000000..3be172664 --- /dev/null +++ b/config/emendatusenigmatica/material/aluminium.json @@ -0,0 +1,34 @@ +{ + "id": "aluminium", + "source": "modded", + "localizedName": "Aluminium", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "rod", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 2 + }, + "colors": { + "materialColor": "a2a8ab", + "fluidColor": "a2a8ab" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_aluminium", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json index 16084a518..5cfe2487d 100644 --- a/config/emendatusenigmatica/material/copper.json +++ b/config/emendatusenigmatica/material/copper.json @@ -22,8 +22,8 @@ "harvestLevel": 1 }, "colors": { - "materialColor": "c87456", - "fluidColor": "c87456" + "materialColor": "d78767", + "fluidColor": "d78767" }, "oreDrop": { "drop": "emendatusenigmatica:raw_copper", diff --git a/config/emendatusenigmatica/material/gold.json b/config/emendatusenigmatica/material/gold.json new file mode 100644 index 000000000..4a124c865 --- /dev/null +++ b/config/emendatusenigmatica/material/gold.json @@ -0,0 +1,35 @@ +{ + "id": "gold", + "source": "vanilla", + "localizedName": "Gold", + "disableDefaultOre": true, + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "gear", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 2 + }, + "colors": { + "materialColor": "fad64a", + "fluidColor": "fad64a" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_gold", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/iron.json b/config/emendatusenigmatica/material/iron.json index 410d1a76e..1047cb49d 100644 --- a/config/emendatusenigmatica/material/iron.json +++ b/config/emendatusenigmatica/material/iron.json @@ -25,8 +25,8 @@ "harvestLevel": 1 }, "colors": { - "materialColor": "d8d8d8", - "fluidColor": "d8d8d8" + "materialColor": "a8a8a8", + "fluidColor": "a8a8a8" }, "oreDrop": { "drop": "emendatusenigmatica:raw_iron", diff --git a/config/emendatusenigmatica/material/lead.json b/config/emendatusenigmatica/material/lead.json new file mode 100644 index 000000000..4730d50f4 --- /dev/null +++ b/config/emendatusenigmatica/material/lead.json @@ -0,0 +1,33 @@ +{ + "id": "lead", + "source": "modded", + "localizedName": "Lead", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 2 + }, + "colors": { + "materialColor": "717991", + "fluidColor": "717991" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_lead", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/nickel.json b/config/emendatusenigmatica/material/nickel.json new file mode 100644 index 000000000..88e7f17b4 --- /dev/null +++ b/config/emendatusenigmatica/material/nickel.json @@ -0,0 +1,33 @@ +{ + "id": "nickel", + "source": "modded", + "localizedName": "Nickel", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 2 + }, + "colors": { + "materialColor": "bec4b1", + "fluidColor": "bec4b1" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_nickel", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/osmium.json b/config/emendatusenigmatica/material/osmium.json new file mode 100644 index 000000000..1f6ddcc2b --- /dev/null +++ b/config/emendatusenigmatica/material/osmium.json @@ -0,0 +1,32 @@ +{ + "id": "osmium", + "source": "modded", + "localizedName": "Osmium", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 2 + }, + "colors": { + "materialColor": "a4b3cf", + "fluidColor": "a4b3cf" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_osmium", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/silver.json b/config/emendatusenigmatica/material/silver.json new file mode 100644 index 000000000..4d3563a8d --- /dev/null +++ b/config/emendatusenigmatica/material/silver.json @@ -0,0 +1,33 @@ +{ + "id": "silver", + "source": "modded", + "localizedName": "Silver", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 2 + }, + "colors": { + "materialColor": "c9d3dc", + "fluidColor": "c9d3dc" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_silver", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/tin.json b/config/emendatusenigmatica/material/tin.json new file mode 100644 index 000000000..afb3f0cb9 --- /dev/null +++ b/config/emendatusenigmatica/material/tin.json @@ -0,0 +1,32 @@ +{ + "id": "tin", + "source": "modded", + "localizedName": "Tin", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 1 + }, + "colors": { + "materialColor": "ececec", + "fluidColor": "ececec" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_tin", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/uranium.json b/config/emendatusenigmatica/material/uranium.json new file mode 100644 index 000000000..f11e7ff4a --- /dev/null +++ b/config/emendatusenigmatica/material/uranium.json @@ -0,0 +1,33 @@ +{ + "id": "uranium", + "source": "modded", + "localizedName": "Uranium", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "plate", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 2 + }, + "colors": { + "materialColor": "98dc95", + "fluidColor": "98dc95" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_uranium", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/zinc.json b/config/emendatusenigmatica/material/zinc.json new file mode 100644 index 000000000..23601decf --- /dev/null +++ b/config/emendatusenigmatica/material/zinc.json @@ -0,0 +1,32 @@ +{ + "id": "zinc", + "source": "modded", + "localizedName": "Zinc", + "processedTypes": [ + "storage_block", + "ore", + "raw", + "crushed_ore", + "ingot", + "nugget", + "dust", + "slurry", + "crystal", + "shard", + "clump", + "dirty_dust" + ], + "properties": { + "materialType": "metal", + "harvestLevel": 1 + }, + "colors": { + "materialColor": "b7e6bf", + "fluidColor": "b7e6bf" + }, + "oreDrop": { + "drop": "emendatusenigmatica:raw_zinc", + "min": 1, + "max": 1 + } +} \ No newline at end of file diff --git a/config/emendatusenigmatica/strata/deepslate.json b/config/emendatusenigmatica/strata/deepslate.json new file mode 100644 index 000000000..bc3d1d9f4 --- /dev/null +++ b/config/emendatusenigmatica/strata/deepslate.json @@ -0,0 +1,7 @@ +{ + "id": "minecraft_deepslate", + "baseTexture": "minecraft:block/deepslate", + "suffix": "deepslate", + "fillerType": "minecraft:deepslate", + "localizedName": "Deepslate" + } \ No newline at end of file diff --git a/config/emendatusenigmatica/strata/netherrrack.json b/config/emendatusenigmatica/strata/netherrrack.json new file mode 100644 index 000000000..c4551cd94 --- /dev/null +++ b/config/emendatusenigmatica/strata/netherrrack.json @@ -0,0 +1,7 @@ +{ + "id": "minecraft_netherrack", + "baseTexture": "minecraft:block/netherrack", + "suffix": "netherrack", + "fillerType": "minecraft:netherrack", + "localizedName": "Netherrack" + } \ No newline at end of file diff --git a/config/emendatusenigmatica/strata/stone.json b/config/emendatusenigmatica/strata/stone.json new file mode 100644 index 000000000..dafc99102 --- /dev/null +++ b/config/emendatusenigmatica/strata/stone.json @@ -0,0 +1,7 @@ +{ + "id": "minecraft_stone", + "baseTexture": "minecraft:block/stone", + "suffix": "stone", + "fillerType": "minecraft:stone", + "localizedName": "Stone" + } \ No newline at end of file From 49425f03a9843baaa116815d69e8ea53ebd86a79 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 11:10:33 +0100 Subject: [PATCH 34/38] add EE data folder to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f80e76952..6c4e6d94a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /.mixin.out/ /logs/ config/forgeendertech/Biomes/ +config/emendatusenigmatica/default /local/ /backups/ /libraries/ From cfd289951dd56d2aa68105f9740802f09bb4afe2 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 12:12:42 +0100 Subject: [PATCH 35/38] Few changes to ore-based materials --- .../material/{aluminium.json => aluminum.json} | 4 ++-- config/emendatusenigmatica/material/gold.json | 4 ++-- config/emendatusenigmatica/material/uranium.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename config/emendatusenigmatica/material/{aluminium.json => aluminum.json} (88%) diff --git a/config/emendatusenigmatica/material/aluminium.json b/config/emendatusenigmatica/material/aluminum.json similarity index 88% rename from config/emendatusenigmatica/material/aluminium.json rename to config/emendatusenigmatica/material/aluminum.json index 3be172664..63b55660e 100644 --- a/config/emendatusenigmatica/material/aluminium.json +++ b/config/emendatusenigmatica/material/aluminum.json @@ -1,5 +1,5 @@ { - "id": "aluminium", + "id": "aluminum", "source": "modded", "localizedName": "Aluminium", "processedTypes": [ @@ -27,7 +27,7 @@ "fluidColor": "a2a8ab" }, "oreDrop": { - "drop": "emendatusenigmatica:raw_aluminium", + "drop": "emendatusenigmatica:raw_aluminum", "min": 1, "max": 1 } diff --git a/config/emendatusenigmatica/material/gold.json b/config/emendatusenigmatica/material/gold.json index 4a124c865..5ff01a497 100644 --- a/config/emendatusenigmatica/material/gold.json +++ b/config/emendatusenigmatica/material/gold.json @@ -24,8 +24,8 @@ "harvestLevel": 2 }, "colors": { - "materialColor": "fad64a", - "fluidColor": "fad64a" + "materialColor": "f7cd40", + "fluidColor": "f7cd40" }, "oreDrop": { "drop": "emendatusenigmatica:raw_gold", diff --git a/config/emendatusenigmatica/material/uranium.json b/config/emendatusenigmatica/material/uranium.json index f11e7ff4a..5c763dede 100644 --- a/config/emendatusenigmatica/material/uranium.json +++ b/config/emendatusenigmatica/material/uranium.json @@ -22,8 +22,8 @@ "harvestLevel": 2 }, "colors": { - "materialColor": "98dc95", - "fluidColor": "98dc95" + "materialColor": "63d459", + "fluidColor": "63d459" }, "oreDrop": { "drop": "emendatusenigmatica:raw_uranium", From 62a8f07c37d0271efecd502a5d8e200790130113 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Nov 2022 11:16:14 +0000 Subject: [PATCH 36/38] Run prettier Co-authored-by: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> --- kubejs/client_scripts/base/jei_hide_gases.js | 8 ++-- .../client_scripts/base/jei_hide_slurries.js | 9 ++-- .../constants/jei_hidden_disabled.js | 25 ++++++++-- .../base/recipes/emendatusenigmatica/dusts.js | 46 ++++++++++--------- .../base/recipes/emendatusenigmatica/gears.js | 12 ++--- .../recipes/emendatusenigmatica/plates.js | 16 +++---- .../base/recipes/emendatusenigmatica/rods.js | 30 ++++++------ .../base/recipes/enigmatica/remove.js | 8 ++-- .../base/tags/items/create/crushed_ores.js | 6 +-- .../items/forge/tools/crafting_hammers.js | 5 +- 10 files changed, 88 insertions(+), 77 deletions(-) diff --git a/kubejs/client_scripts/base/jei_hide_gases.js b/kubejs/client_scripts/base/jei_hide_gases.js index 966292ec1..88a9a1889 100644 --- a/kubejs/client_scripts/base/jei_hide_gases.js +++ b/kubejs/client_scripts/base/jei_hide_gases.js @@ -1,6 +1,6 @@ -let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI') -JEIEvents.hideCustom(event => { +let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI'); +JEIEvents.hideCustom((event) => { jei.base.gases.hidden.forEach((hiddenGas) => { - event.get(MekanismJEI.TYPE_GAS).hide(hiddenGas) + event.get(MekanismJEI.TYPE_GAS).hide(hiddenGas); }); -}); \ No newline at end of file +}); diff --git a/kubejs/client_scripts/base/jei_hide_slurries.js b/kubejs/client_scripts/base/jei_hide_slurries.js index b8b2beddc..1a44be63a 100644 --- a/kubejs/client_scripts/base/jei_hide_slurries.js +++ b/kubejs/client_scripts/base/jei_hide_slurries.js @@ -1,9 +1,8 @@ -let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI') -JEIEvents.hideCustom(event => { - - const slurries = [/mekanism:clean_/, /mekanism:dirty_/] +let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI'); +JEIEvents.hideCustom((event) => { + const slurries = [/mekanism:clean_/, /mekanism:dirty_/]; slurries.forEach((hiddenSlurry) => { event.get(MekanismJEI.TYPE_SLURRY).hide(hiddenSlurry); }); -}); \ No newline at end of file +}); diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js index a26cd7b1c..3e40ab7b6 100644 --- a/kubejs/client_scripts/constants/jei_hidden_disabled.js +++ b/kubejs/client_scripts/constants/jei_hidden_disabled.js @@ -6,9 +6,24 @@ const disabled_item_message = const disabled_item_tooltip = 'This item has been disabled.'; const jei = { - base: { items: { hidden: [], disabled: [] }, categories: { hidden: [] }, fluids: { hidden: [] }, gases: { hidden: [] }}, - normal: { items: { hidden: [], disabled: [] }, categories: { hidden: [] }, fluids: { hidden: [] }, gases: { hidden: [] }}, - expert: { items: { hidden: [], disabled: [] }, categories: { hidden: [] }, fluids: { hidden: [] }, gases: { hidden: [] }} + base: { + items: { hidden: [], disabled: [] }, + categories: { hidden: [] }, + fluids: { hidden: [] }, + gases: { hidden: [] } + }, + normal: { + items: { hidden: [], disabled: [] }, + categories: { hidden: [] }, + fluids: { hidden: [] }, + gases: { hidden: [] } + }, + expert: { + items: { hidden: [], disabled: [] }, + categories: { hidden: [] }, + fluids: { hidden: [] }, + gases: { hidden: [] } + } }; // Base jei.base.items.disabled = [ @@ -78,8 +93,8 @@ jei.base.items.hidden = [ ]; jei.base.categories.hidden = ['twilightforest:uncrafting']; -jei.base.fluids.hidden = [] -jei.base.gases.hidden = [] +jei.base.fluids.hidden = []; +jei.base.gases.hidden = []; // Normal jei.normal.items.disabled = []; diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js index 131123891..b4dd66fbc 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js @@ -1,43 +1,47 @@ ServerEvents.recipes((event) => { const recipes = []; - const recipes_to_remove = [] + const recipes_to_remove = []; - const exceptions = [] + const exceptions = []; let props = Object.keys(metal_properties); props.forEach((metal) => { if (Item.exists(`emendatusenigmatica:raw_${metal}`)) { - recipes.push({ - output: `emendatusenigmatica:${metal}_dust`, - inputs: [`#forge:raw_materials/${metal}`, '#forge:tools/crafting_hammers'], - id: `emendatusenigmatica:dust/from_raw/${metal}` - }, - { - output: `emendatusenigmatica:${metal}_dust`, - inputs: [`#forge:ores/${metal}`, '#forge:tools/crafting_hammers'], - id: `emendatusenigmatica:dust/from_ore/${metal}` - }) + recipes.push( + { + output: `emendatusenigmatica:${metal}_dust`, + inputs: [`#forge:raw_materials/${metal}`, '#forge:tools/crafting_hammers'], + id: `emendatusenigmatica:dust/from_raw/${metal}` + }, + { + output: `emendatusenigmatica:${metal}_dust`, + inputs: [`#forge:ores/${metal}`, '#forge:tools/crafting_hammers'], + id: `emendatusenigmatica:dust/from_ore/${metal}` + } + ); // Remove other recipes // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" if (!exceptions.includes(metal)) { - recipes_to_remove.push({ - id: `immersiveengineering:crafting/raw_hammercrushing_${metal}` - }, - { - id: `immersiveengineering:crafting/hammercrushing_${metal}` - }) + recipes_to_remove.push( + { + id: `immersiveengineering:crafting/raw_hammercrushing_${metal}` + }, + { + id: `immersiveengineering:crafting/hammercrushing_${metal}` + } + ); } } - }) + }); recipes.forEach((recipe) => { event.shapeless(recipe.output, recipe.inputs).id(recipe.id); }); recipes_to_remove.forEach((recipe) => { - event.remove(recipe) - }) + event.remove(recipe); + }); }); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js index a2215ff78..7bc23735a 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js @@ -1,10 +1,10 @@ ServerEvents.recipes((event) => { const recipes = []; - const recipes_to_remove = [] + const recipes_to_remove = []; let props = Object.keys(metal_properties); - + props.forEach((metal) => { if (Item.exists(`emendatusenigmatica:${metal}_gear`)) { // Remove other recipes @@ -13,16 +13,16 @@ ServerEvents.recipes((event) => { if (Item.exists(`industrialforegoing:${metal}_gear`)) { recipes_to_remove.push({ id: `industrialforegoing:${metal}_gear` - }) + }); } } - }) + }); recipes.forEach((recipe) => { event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); }); recipes_to_remove.forEach((recipe) => { - event.remove(recipe) - }) + event.remove(recipe); + }); }); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js index 67d12280d..e342d0036 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js @@ -1,11 +1,9 @@ ServerEvents.recipes((event) => { const recipes = []; - const recipes_to_remove = [] + const recipes_to_remove = []; - const exceptions = [ - 'brass' - ] + const exceptions = ['brass']; let props = Object.keys(metal_properties); @@ -15,23 +13,23 @@ ServerEvents.recipes((event) => { output: `emendatusenigmatica:${metal}_plate`, inputs: [`#forge:ingots/${metal}`, '#forge:tools/crafting_hammers'], id: `emendatusenigmatica:plate/from_ingot/${metal}` - }) + }); // Remove other recipes // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" if (!exceptions.includes(metal)) { recipes_to_remove.push({ id: `immersiveengineering:crafting/plate_${metal}_hammering` - }) + }); } } - }) + }); recipes.forEach((recipe) => { event.shapeless(recipe.output, recipe.inputs).id(recipe.id); }); recipes_to_remove.forEach((recipe) => { - event.remove(recipe) - }) + event.remove(recipe); + }); }); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js index f23847e59..91188183c 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js @@ -1,38 +1,36 @@ ServerEvents.recipes((event) => { const recipes = []; - const recipes_to_remove = [] + const recipes_to_remove = []; let props = Object.keys(metal_properties); - + props.forEach((metal) => { if (Item.exists(`emendatusenigmatica:${metal}_rod`)) { - recipes.push( - { - output: Item.of(`emendatusenigmatica:${metal}_rod`,4), - pattern: [' A ', ' A '], - key: { - A: `#forge:ingots/${metal}`, - }, - id: `emendatusenigmatica:rod/from_ingot/${metal}` - } - ) + recipes.push({ + output: Item.of(`emendatusenigmatica:${metal}_rod`, 4), + pattern: [' A ', ' A '], + key: { + A: `#forge:ingots/${metal}` + }, + id: `emendatusenigmatica:rod/from_ingot/${metal}` + }); // Remove other recipes // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" if (Item.exists(`immersiveengineering:stick_${metal}`)) { recipes_to_remove.push({ id: `immersiveengineering:crafting/stick_${metal}` - }) + }); } } - }) + }); recipes.forEach((recipe) => { event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); }); recipes_to_remove.forEach((recipe) => { - event.remove(recipe) - }) + event.remove(recipe); + }); }); diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js index d1183d40b..716a782ae 100644 --- a/kubejs/server_scripts/base/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/base/recipes/enigmatica/remove.js @@ -16,11 +16,11 @@ ServerEvents.recipes((event) => { { id: /mekanism:bin\/.*/ }, { id: /mekanism:processing\/.*\/to.*_ore/ }, { id: /mekanism:processing\/.*\/ore\/.*from_raw/ }, - { id: /mekanism:processing\/.*\/crystal\/from_slurry/}, - { id: /mekanism:processing\/.*\/slurry\/clean/}, - { id: /mekanism:processing\/.*\/slurry\/dirty/}, + { id: /mekanism:processing\/.*\/crystal\/from_slurry/ }, + { id: /mekanism:processing\/.*\/slurry\/clean/ }, + { id: /mekanism:processing\/.*\/slurry\/dirty/ }, { id: 'mekanism:processing/netherite/dust_to_ancient_debris' }, - { id: 'quark:tweaks/smelting/bone_meal_utility'}, + { id: 'quark:tweaks/smelting/bone_meal_utility' }, { type: 'immersiveengineering:sawmill' }, { type: 'create:cutting' }, { type: 'immersiveengineering:cloche' }, diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js index edbe9655d..a30a05d1b 100644 --- a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js +++ b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js @@ -1,9 +1,9 @@ -ServerEvents.tags("item", (event) => { +ServerEvents.tags('item', (event) => { let props = Object.keys(metal_properties); props.forEach((metal) => { if (Item.exists(`create:crushed_${metal}_ore`)) { - event.get(`create:crushed_ores/${metal}`).add(`create:crushed_${metal}_ore`) + event.get(`create:crushed_ores/${metal}`).add(`create:crushed_${metal}_ore`); } }); -}); \ No newline at end of file +}); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js index fb3e1f858..649082e4c 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js @@ -1,8 +1,5 @@ ServerEvents.tags('item', (event) => { - const items = [ - 'immersiveengineering:hammer', - 'emendatusenigmatica:enigmatic_hammer' - ]; + const items = ['immersiveengineering:hammer', 'emendatusenigmatica:enigmatic_hammer']; const exceptions = []; // const tagGroups = ['forge:tools', 'forge:tools/crafting_hammers']; From cb205577404b8500d933261e75cf3b079aca3675 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 12:48:30 +0100 Subject: [PATCH 37/38] Revert "Merge branch 'EE-Setup' into develop" This reverts commit b3432699a90dcb457e769224c9a57e9eeddcdb33, reversing changes made to 3754b7391ebcd4d5dc208e1b29b93e5849239bab. --- .gitignore | 1 - config/Mekanism/world.toml | 10 +-- config/almostunified/unify.json | 11 +-- config/create-common.toml | 2 +- .../material/aluminum.json | 34 --------- .../emendatusenigmatica/material/copper.json | 33 --------- config/emendatusenigmatica/material/gold.json | 35 --------- config/emendatusenigmatica/material/iron.json | 36 ---------- config/emendatusenigmatica/material/lead.json | 33 --------- .../emendatusenigmatica/material/nickel.json | 33 --------- .../emendatusenigmatica/material/osmium.json | 32 --------- .../emendatusenigmatica/material/silver.json | 33 --------- config/emendatusenigmatica/material/tin.json | 32 --------- .../emendatusenigmatica/material/uranium.json | 33 --------- config/emendatusenigmatica/material/zinc.json | 32 --------- .../emendatusenigmatica/strata/deepslate.json | 7 -- .../strata/netherrrack.json | 7 -- config/emendatusenigmatica/strata/stone.json | 7 -- config/jei/ingredient-list-mod-sort-order.ini | 1 - config/powah.json5 | 6 +- config/rftoolsbase-common.toml | 8 +-- .../immersiveengineering-server.toml | 12 ++-- kubejs/client_scripts/base/jei_hide_fluids.js | 5 -- kubejs/client_scripts/base/jei_hide_gases.js | 6 -- .../client_scripts/base/jei_hide_slurries.js | 8 --- .../constants/jei_hidden_disabled.js | 32 ++------- .../base/recipes/emendatusenigmatica/dusts.js | 47 ------------ .../base/recipes/emendatusenigmatica/gears.js | 28 -------- .../recipes/emendatusenigmatica/plates.js | 35 --------- .../base/recipes/emendatusenigmatica/rods.js | 36 ---------- .../base/recipes/enigmatica/remove.js | 6 -- .../base/tags/items/create/crushed_ores.js | 9 --- .../items/forge/tools/crafting_hammers.js | 2 +- .../constants/metal_properties.js | 72 +++++++++---------- kubejs/startup_scripts/worldgen_remove.js | 14 ++-- 35 files changed, 66 insertions(+), 672 deletions(-) delete mode 100644 config/emendatusenigmatica/material/aluminum.json delete mode 100644 config/emendatusenigmatica/material/copper.json delete mode 100644 config/emendatusenigmatica/material/gold.json delete mode 100644 config/emendatusenigmatica/material/iron.json delete mode 100644 config/emendatusenigmatica/material/lead.json delete mode 100644 config/emendatusenigmatica/material/nickel.json delete mode 100644 config/emendatusenigmatica/material/osmium.json delete mode 100644 config/emendatusenigmatica/material/silver.json delete mode 100644 config/emendatusenigmatica/material/tin.json delete mode 100644 config/emendatusenigmatica/material/uranium.json delete mode 100644 config/emendatusenigmatica/material/zinc.json delete mode 100644 config/emendatusenigmatica/strata/deepslate.json delete mode 100644 config/emendatusenigmatica/strata/netherrrack.json delete mode 100644 config/emendatusenigmatica/strata/stone.json delete mode 100644 kubejs/client_scripts/base/jei_hide_fluids.js diff --git a/.gitignore b/.gitignore index 6c4e6d94a..f80e76952 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ /.mixin.out/ /logs/ config/forgeendertech/Biomes/ -config/emendatusenigmatica/default /local/ /backups/ /libraries/ diff --git a/config/Mekanism/world.toml b/config/Mekanism/world.toml index 2731a3676..5864a514b 100644 --- a/config/Mekanism/world.toml +++ b/config/Mekanism/world.toml @@ -10,7 +10,7 @@ #Generation Settings for tin ore. [world_generation.tin] #Determines if tin ore should be added to world generation. - shouldGenerate = false + shouldGenerate = true #small tin vein Generation Settings. [world_generation.tin.small] @@ -97,7 +97,7 @@ #Generation Settings for osmium ore. [world_generation.osmium] #Determines if osmium ore should be added to world generation. - shouldGenerate = false + shouldGenerate = true #upper osmium vein Generation Settings. [world_generation.osmium.upper] @@ -225,7 +225,7 @@ #Generation Settings for uranium ore. [world_generation.uranium] #Determines if uranium ore should be added to world generation. - shouldGenerate = false + shouldGenerate = true #small uranium vein Generation Settings. [world_generation.uranium.small] @@ -312,7 +312,7 @@ #Generation Settings for fluorite ore. [world_generation.fluorite] #Determines if fluorite ore should be added to world generation. - shouldGenerate = false + shouldGenerate = true #normal fluorite vein Generation Settings. [world_generation.fluorite.normal] @@ -399,7 +399,7 @@ #Generation Settings for lead ore. [world_generation.lead] #Determines if lead ore should be added to world generation. - shouldGenerate = false + shouldGenerate = true #normal lead vein Generation Settings. [world_generation.lead.normal] diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json index 4051625e3..83d7b19e9 100644 --- a/config/almostunified/unify.json +++ b/config/almostunified/unify.json @@ -1,8 +1,8 @@ { "modPriorities": [ - "emendatusenigmatica", "minecraft", "kubejs", + "crafttweaker", "create", "thermal", "mekanism", @@ -28,16 +28,9 @@ "forge:plates/{material}", "forge:rods/{material}", "forge:storage_blocks/{material}", - "forge:storage_blocks/raw_{material}", "forge:slag", "forge:coal_coke", - "forge:sawdust", - "mekanism:crystals/{material}", - "mekanism:shards/{material}", - "mekanism:clumps/{material}", - "mekanism:dirty_dusts/{material}", - "mekanism:shards/{material}", - "create:crushed_ores/{material}" + "forge:sawdust" ], "materials": [ "aeternium", diff --git a/config/create-common.toml b/config/create-common.toml index ba656d760..0a889e901 100644 --- a/config/create-common.toml +++ b/config/create-common.toml @@ -7,7 +7,7 @@ #. #. #Prevents all worldgen added by Create from taking effect - disableWorldGen = true + disableWorldGen = false [worldgen.v2.striated_ores_nether] #. diff --git a/config/emendatusenigmatica/material/aluminum.json b/config/emendatusenigmatica/material/aluminum.json deleted file mode 100644 index 63b55660e..000000000 --- a/config/emendatusenigmatica/material/aluminum.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "id": "aluminum", - "source": "modded", - "localizedName": "Aluminium", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "rod", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 2 - }, - "colors": { - "materialColor": "a2a8ab", - "fluidColor": "a2a8ab" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_aluminum", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/copper.json b/config/emendatusenigmatica/material/copper.json deleted file mode 100644 index 5cfe2487d..000000000 --- a/config/emendatusenigmatica/material/copper.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "id": "copper", - "source": "vanilla", - "localizedName": "Copper", - "disableDefaultOre": true, - "processedTypes": [ - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 1 - }, - "colors": { - "materialColor": "d78767", - "fluidColor": "d78767" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_copper", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/gold.json b/config/emendatusenigmatica/material/gold.json deleted file mode 100644 index 5ff01a497..000000000 --- a/config/emendatusenigmatica/material/gold.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "id": "gold", - "source": "vanilla", - "localizedName": "Gold", - "disableDefaultOre": true, - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "gear", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 2 - }, - "colors": { - "materialColor": "f7cd40", - "fluidColor": "f7cd40" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_gold", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/iron.json b/config/emendatusenigmatica/material/iron.json deleted file mode 100644 index 1047cb49d..000000000 --- a/config/emendatusenigmatica/material/iron.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "id": "iron", - "source": "vanilla", - "localizedName": "Iron", - "disableDefaultOre": true, - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "rod", - "gear", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 1 - }, - "colors": { - "materialColor": "a8a8a8", - "fluidColor": "a8a8a8" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_iron", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/lead.json b/config/emendatusenigmatica/material/lead.json deleted file mode 100644 index 4730d50f4..000000000 --- a/config/emendatusenigmatica/material/lead.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "id": "lead", - "source": "modded", - "localizedName": "Lead", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 2 - }, - "colors": { - "materialColor": "717991", - "fluidColor": "717991" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_lead", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/nickel.json b/config/emendatusenigmatica/material/nickel.json deleted file mode 100644 index 88e7f17b4..000000000 --- a/config/emendatusenigmatica/material/nickel.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "id": "nickel", - "source": "modded", - "localizedName": "Nickel", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 2 - }, - "colors": { - "materialColor": "bec4b1", - "fluidColor": "bec4b1" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_nickel", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/osmium.json b/config/emendatusenigmatica/material/osmium.json deleted file mode 100644 index 1f6ddcc2b..000000000 --- a/config/emendatusenigmatica/material/osmium.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "id": "osmium", - "source": "modded", - "localizedName": "Osmium", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 2 - }, - "colors": { - "materialColor": "a4b3cf", - "fluidColor": "a4b3cf" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_osmium", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/silver.json b/config/emendatusenigmatica/material/silver.json deleted file mode 100644 index 4d3563a8d..000000000 --- a/config/emendatusenigmatica/material/silver.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "id": "silver", - "source": "modded", - "localizedName": "Silver", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 2 - }, - "colors": { - "materialColor": "c9d3dc", - "fluidColor": "c9d3dc" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_silver", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/tin.json b/config/emendatusenigmatica/material/tin.json deleted file mode 100644 index afb3f0cb9..000000000 --- a/config/emendatusenigmatica/material/tin.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "id": "tin", - "source": "modded", - "localizedName": "Tin", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 1 - }, - "colors": { - "materialColor": "ececec", - "fluidColor": "ececec" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_tin", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/uranium.json b/config/emendatusenigmatica/material/uranium.json deleted file mode 100644 index 5c763dede..000000000 --- a/config/emendatusenigmatica/material/uranium.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "id": "uranium", - "source": "modded", - "localizedName": "Uranium", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "plate", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 2 - }, - "colors": { - "materialColor": "63d459", - "fluidColor": "63d459" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_uranium", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/material/zinc.json b/config/emendatusenigmatica/material/zinc.json deleted file mode 100644 index 23601decf..000000000 --- a/config/emendatusenigmatica/material/zinc.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "id": "zinc", - "source": "modded", - "localizedName": "Zinc", - "processedTypes": [ - "storage_block", - "ore", - "raw", - "crushed_ore", - "ingot", - "nugget", - "dust", - "slurry", - "crystal", - "shard", - "clump", - "dirty_dust" - ], - "properties": { - "materialType": "metal", - "harvestLevel": 1 - }, - "colors": { - "materialColor": "b7e6bf", - "fluidColor": "b7e6bf" - }, - "oreDrop": { - "drop": "emendatusenigmatica:raw_zinc", - "min": 1, - "max": 1 - } -} \ No newline at end of file diff --git a/config/emendatusenigmatica/strata/deepslate.json b/config/emendatusenigmatica/strata/deepslate.json deleted file mode 100644 index bc3d1d9f4..000000000 --- a/config/emendatusenigmatica/strata/deepslate.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "minecraft_deepslate", - "baseTexture": "minecraft:block/deepslate", - "suffix": "deepslate", - "fillerType": "minecraft:deepslate", - "localizedName": "Deepslate" - } \ No newline at end of file diff --git a/config/emendatusenigmatica/strata/netherrrack.json b/config/emendatusenigmatica/strata/netherrrack.json deleted file mode 100644 index c4551cd94..000000000 --- a/config/emendatusenigmatica/strata/netherrrack.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "minecraft_netherrack", - "baseTexture": "minecraft:block/netherrack", - "suffix": "netherrack", - "fillerType": "minecraft:netherrack", - "localizedName": "Netherrack" - } \ No newline at end of file diff --git a/config/emendatusenigmatica/strata/stone.json b/config/emendatusenigmatica/strata/stone.json deleted file mode 100644 index dafc99102..000000000 --- a/config/emendatusenigmatica/strata/stone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "minecraft_stone", - "baseTexture": "minecraft:block/stone", - "suffix": "stone", - "fillerType": "minecraft:stone", - "localizedName": "Stone" - } \ No newline at end of file diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini index 455a7cd41..181eecb4b 100644 --- a/config/jei/ingredient-list-mod-sort-order.ini +++ b/config/jei/ingredient-list-mod-sort-order.ini @@ -91,4 +91,3 @@ Thermal Innovation Thermal Integration Thermal Locomotion Thermal Series -Emendatus Enigmatica \ No newline at end of file diff --git a/config/powah.json5 b/config/powah.json5 index cb31b2719..c7ea29450 100644 --- a/config/powah.json5 +++ b/config/powah.json5 @@ -3,9 +3,9 @@ "worldgen": { // Enable this to disable worldgen entirely. If true, the other options have no effect. "disable_all": false, - "poor_uraninite_veins_per_chunk": 0, - "uraninite_veins_per_chunk": 0, - "dense_uraninite_veins_per_chunk": 0, + "poor_uraninite_veins_per_chunk": 8, + "uraninite_veins_per_chunk": 6, + "dense_uraninite_veins_per_chunk": 3, "dry_ice_veins_per_chunk": 9 }, // Other general config options. diff --git a/config/rftoolsbase-common.toml b/config/rftoolsbase-common.toml index 643f96706..6acd1e871 100644 --- a/config/rftoolsbase-common.toml +++ b/config/rftoolsbase-common.toml @@ -6,7 +6,7 @@ [worldgen.dimensions] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 0 + oreChances = 6 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 10 @@ -21,7 +21,7 @@ [worldgen.overworld] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 0 + oreChances = 2 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 5 @@ -36,7 +36,7 @@ [worldgen.nether] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 0 + oreChances = 8 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 8 @@ -51,7 +51,7 @@ [worldgen.end] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 0 + oreChances = 8 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 10 diff --git a/defaultconfigs/immersiveengineering-server.toml b/defaultconfigs/immersiveengineering-server.toml index a373ec37c..643d9c71c 100644 --- a/defaultconfigs/immersiveengineering-server.toml +++ b/defaultconfigs/immersiveengineering-server.toml @@ -352,7 +352,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 0 + vein_size = 6 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = 32 @@ -375,7 +375,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 0 + vein_size = 8 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -32 @@ -398,7 +398,7 @@ air_exposure = 0.25 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 0 + vein_size = 9 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -48 @@ -421,7 +421,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 0 + vein_size = 5 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -64 @@ -444,7 +444,7 @@ air_exposure = 0.0 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 0 + vein_size = 6 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -120 @@ -467,7 +467,7 @@ air_exposure = 0.5 #The maximum size of a vein. Set to 0 to disable generation #Range: > 0 - vein_size = 0 + vein_size = 4 #The minimum Y coordinate this ore can spawn at #Range: > -2147483648 min_y = -64 diff --git a/kubejs/client_scripts/base/jei_hide_fluids.js b/kubejs/client_scripts/base/jei_hide_fluids.js deleted file mode 100644 index 49b0b7eb7..000000000 --- a/kubejs/client_scripts/base/jei_hide_fluids.js +++ /dev/null @@ -1,5 +0,0 @@ -JEIEvents.hideFluids((event) => { - jei.base.fluids.hidden.forEach((hiddenFluid) => { - event.hide(hiddenFluid); - }); -}); diff --git a/kubejs/client_scripts/base/jei_hide_gases.js b/kubejs/client_scripts/base/jei_hide_gases.js index 88a9a1889..e69de29bb 100644 --- a/kubejs/client_scripts/base/jei_hide_gases.js +++ b/kubejs/client_scripts/base/jei_hide_gases.js @@ -1,6 +0,0 @@ -let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI'); -JEIEvents.hideCustom((event) => { - jei.base.gases.hidden.forEach((hiddenGas) => { - event.get(MekanismJEI.TYPE_GAS).hide(hiddenGas); - }); -}); diff --git a/kubejs/client_scripts/base/jei_hide_slurries.js b/kubejs/client_scripts/base/jei_hide_slurries.js index 1a44be63a..e69de29bb 100644 --- a/kubejs/client_scripts/base/jei_hide_slurries.js +++ b/kubejs/client_scripts/base/jei_hide_slurries.js @@ -1,8 +0,0 @@ -let MekanismJEI = Java.loadClass('mekanism.client.jei.MekanismJEI'); -JEIEvents.hideCustom((event) => { - const slurries = [/mekanism:clean_/, /mekanism:dirty_/]; - - slurries.forEach((hiddenSlurry) => { - event.get(MekanismJEI.TYPE_SLURRY).hide(hiddenSlurry); - }); -}); diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js index 3e40ab7b6..d00f7e47b 100644 --- a/kubejs/client_scripts/constants/jei_hidden_disabled.js +++ b/kubejs/client_scripts/constants/jei_hidden_disabled.js @@ -6,24 +6,9 @@ const disabled_item_message = const disabled_item_tooltip = 'This item has been disabled.'; const jei = { - base: { - items: { hidden: [], disabled: [] }, - categories: { hidden: [] }, - fluids: { hidden: [] }, - gases: { hidden: [] } - }, - normal: { - items: { hidden: [], disabled: [] }, - categories: { hidden: [] }, - fluids: { hidden: [] }, - gases: { hidden: [] } - }, - expert: { - items: { hidden: [], disabled: [] }, - categories: { hidden: [] }, - fluids: { hidden: [] }, - gases: { hidden: [] } - } + base: { items: { hidden: [], disabled: [] }, categories: { hidden: [] } }, + normal: { items: { hidden: [], disabled: [] }, categories: { hidden: [] } }, + expert: { items: { hidden: [], disabled: [] }, categories: { hidden: [] } } }; // Base jei.base.items.disabled = [ @@ -87,25 +72,16 @@ jei.base.items.hidden = [ 'twilightforest:ur_ghast_boss_spawner', 'twilightforest:knight_phantom_boss_spawner', 'twilightforest:minoshroom_boss_spawner', - 'twilightforest:lich_boss_spawner', - 'mekanism:creative_fluid_tank', - 'mekanism:creative_chemical_tank' + 'twilightforest:lich_boss_spawner' ]; jei.base.categories.hidden = ['twilightforest:uncrafting']; -jei.base.fluids.hidden = []; -jei.base.gases.hidden = []; - // Normal jei.normal.items.disabled = []; jei.normal.items.hidden = []; jei.normal.categories.hidden = []; -jei.normal.fluids.hidden = []; -jei.normal.gases.hidden = []; // Expert jei.expert.items.disabled = []; jei.expert.items.hidden = []; jei.expert.categories.hidden = []; -jei.expert.fluids.hidden = []; -jei.expert.gases.hidden = []; diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js index b4dd66fbc..e69de29bb 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js @@ -1,47 +0,0 @@ -ServerEvents.recipes((event) => { - const recipes = []; - - const recipes_to_remove = []; - - const exceptions = []; - - let props = Object.keys(metal_properties); - - props.forEach((metal) => { - if (Item.exists(`emendatusenigmatica:raw_${metal}`)) { - recipes.push( - { - output: `emendatusenigmatica:${metal}_dust`, - inputs: [`#forge:raw_materials/${metal}`, '#forge:tools/crafting_hammers'], - id: `emendatusenigmatica:dust/from_raw/${metal}` - }, - { - output: `emendatusenigmatica:${metal}_dust`, - inputs: [`#forge:ores/${metal}`, '#forge:tools/crafting_hammers'], - id: `emendatusenigmatica:dust/from_ore/${metal}` - } - ); - // Remove other recipes - // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> - // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" - if (!exceptions.includes(metal)) { - recipes_to_remove.push( - { - id: `immersiveengineering:crafting/raw_hammercrushing_${metal}` - }, - { - id: `immersiveengineering:crafting/hammercrushing_${metal}` - } - ); - } - } - }); - - recipes.forEach((recipe) => { - event.shapeless(recipe.output, recipe.inputs).id(recipe.id); - }); - - recipes_to_remove.forEach((recipe) => { - event.remove(recipe); - }); -}); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js index 7bc23735a..e69de29bb 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js @@ -1,28 +0,0 @@ -ServerEvents.recipes((event) => { - const recipes = []; - - const recipes_to_remove = []; - - let props = Object.keys(metal_properties); - - props.forEach((metal) => { - if (Item.exists(`emendatusenigmatica:${metal}_gear`)) { - // Remove other recipes - // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> - // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" - if (Item.exists(`industrialforegoing:${metal}_gear`)) { - recipes_to_remove.push({ - id: `industrialforegoing:${metal}_gear` - }); - } - } - }); - - recipes.forEach((recipe) => { - event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); - }); - - recipes_to_remove.forEach((recipe) => { - event.remove(recipe); - }); -}); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js index e342d0036..e69de29bb 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js @@ -1,35 +0,0 @@ -ServerEvents.recipes((event) => { - const recipes = []; - - const recipes_to_remove = []; - - const exceptions = ['brass']; - - let props = Object.keys(metal_properties); - - props.forEach((metal) => { - if (Item.exists(`emendatusenigmatica:${metal}_plate`)) { - recipes.push({ - output: `emendatusenigmatica:${metal}_plate`, - inputs: [`#forge:ingots/${metal}`, '#forge:tools/crafting_hammers'], - id: `emendatusenigmatica:plate/from_ingot/${metal}` - }); - // Remove other recipes - // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> - // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" - if (!exceptions.includes(metal)) { - recipes_to_remove.push({ - id: `immersiveengineering:crafting/plate_${metal}_hammering` - }); - } - } - }); - - recipes.forEach((recipe) => { - event.shapeless(recipe.output, recipe.inputs).id(recipe.id); - }); - - recipes_to_remove.forEach((recipe) => { - event.remove(recipe); - }); -}); diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js index 91188183c..e69de29bb 100644 --- a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js +++ b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js @@ -1,36 +0,0 @@ -ServerEvents.recipes((event) => { - const recipes = []; - - const recipes_to_remove = []; - - let props = Object.keys(metal_properties); - - props.forEach((metal) => { - if (Item.exists(`emendatusenigmatica:${metal}_rod`)) { - recipes.push({ - output: Item.of(`emendatusenigmatica:${metal}_rod`, 4), - pattern: [' A ', ' A '], - key: { - A: `#forge:ingots/${metal}` - }, - id: `emendatusenigmatica:rod/from_ingot/${metal}` - }); - // Remove other recipes - // Reason for this is pretty simple, AU doesn't unify recipes that are created / modified by KubeJS, so we need to remove unused recipes manually >.> - // OR recipe is a bit different, but if we modify it, it will not be Unified as well ^^" - if (Item.exists(`immersiveengineering:stick_${metal}`)) { - recipes_to_remove.push({ - id: `immersiveengineering:crafting/stick_${metal}` - }); - } - } - }); - - recipes.forEach((recipe) => { - event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id); - }); - - recipes_to_remove.forEach((recipe) => { - event.remove(recipe); - }); -}); diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js index 716a782ae..1ab9a3562 100644 --- a/kubejs/server_scripts/base/recipes/enigmatica/remove.js +++ b/kubejs/server_scripts/base/recipes/enigmatica/remove.js @@ -14,12 +14,6 @@ ServerEvents.recipes((event) => { { id: /mekanism:sawing\/log/ }, { id: /mekanism:compat\/byg\/combining\/.*_ore_/ }, { id: /mekanism:bin\/.*/ }, - { id: /mekanism:processing\/.*\/to.*_ore/ }, - { id: /mekanism:processing\/.*\/ore\/.*from_raw/ }, - { id: /mekanism:processing\/.*\/crystal\/from_slurry/ }, - { id: /mekanism:processing\/.*\/slurry\/clean/ }, - { id: /mekanism:processing\/.*\/slurry\/dirty/ }, - { id: 'mekanism:processing/netherite/dust_to_ancient_debris' }, { id: 'quark:tweaks/smelting/bone_meal_utility' }, { type: 'immersiveengineering:sawmill' }, { type: 'create:cutting' }, diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js index a30a05d1b..e69de29bb 100644 --- a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js +++ b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js @@ -1,9 +0,0 @@ -ServerEvents.tags('item', (event) => { - let props = Object.keys(metal_properties); - - props.forEach((metal) => { - if (Item.exists(`create:crushed_${metal}_ore`)) { - event.get(`create:crushed_ores/${metal}`).add(`create:crushed_${metal}_ore`); - } - }); -}); diff --git a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js index 649082e4c..e3965214a 100644 --- a/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js +++ b/kubejs/server_scripts/base/tags/items/forge/tools/crafting_hammers.js @@ -1,5 +1,5 @@ ServerEvents.tags('item', (event) => { - const items = ['immersiveengineering:hammer', 'emendatusenigmatica:enigmatic_hammer']; + const items = ['immersiveengineering:hammer']; const exceptions = []; // const tagGroups = ['forge:tools', 'forge:tools/crafting_hammers']; diff --git a/kubejs/server_scripts/constants/metal_properties.js b/kubejs/server_scripts/constants/metal_properties.js index cf99f0759..5e3806a62 100644 --- a/kubejs/server_scripts/constants/metal_properties.js +++ b/kubejs/server_scripts/constants/metal_properties.js @@ -137,18 +137,18 @@ const metal_properties = { } } }, - // cobalt: { - // meltingPoint: 950, - // oreProcessing: { - // output: { - // substrate: 'minecraft:netherrack', - // secondary: 'iron' - // }, - // create: { - // processingTime: 400 - // } - // } - // }, + cobalt: { + meltingPoint: 950, + oreProcessing: { + output: { + substrate: 'minecraft:netherrack', + secondary: 'iron' + }, + create: { + processingTime: 400 + } + } + }, iesnium: { meltingPoint: 850, oreProcessing: { @@ -161,33 +161,33 @@ const metal_properties = { } } }, - // elementium: { - // meltingPoint: 875 - // }, - // enderium: { - // meltingPoint: 1450 - // }, - // signalum: { - // meltingPoint: 1272 - // }, - // lumium: { - // meltingPoint: 1354 - // }, - // manasteel: { - // meltingPoint: 900 - // }, - // terrasteel: { - // meltingPoint: 1350 - // }, - // gaia_spirit: { - // meltingPoint: 975 - // }, + elementium: { + meltingPoint: 875 + }, + enderium: { + meltingPoint: 1450 + }, + signalum: { + meltingPoint: 1272 + }, + lumium: { + meltingPoint: 1354 + }, + manasteel: { + meltingPoint: 900 + }, + terrasteel: { + meltingPoint: 1350 + }, + gaia_spirit: { + meltingPoint: 975 + }, infused_iron: { meltingPoint: 850 }, - // sky_metal: { - // meltingPoint: 950 - // }, + sky_metal: { + meltingPoint: 950 + }, energized_steel: { meltingPoint: 875 } diff --git a/kubejs/startup_scripts/worldgen_remove.js b/kubejs/startup_scripts/worldgen_remove.js index 27c777082..8b561ee0c 100644 --- a/kubejs/startup_scripts/worldgen_remove.js +++ b/kubejs/startup_scripts/worldgen_remove.js @@ -1,14 +1,8 @@ WorldgenEvents.remove((event) => { // https://mods.latvian.dev/books/kubejs/page/worldgen-events // console.debugEnabled = true; - event.removeOres((props) => { - props.worldgenLayer = 'underground_ores'; - props.blocks = [ - 'blue_skies:horizonite_ore', - 'blue_skies:ventium_ore', - 'blue_skies:falsite_ore', - 'occultism:silver_ore', - 'occultism:silver_ore_deepslate' - ]; - }); + // event.removeOres((props) => { + // props.worldgenLayer = 'underground_ores'; + // props.blocks = ['blue_skies:horizonite_ore', 'blue_skies:ventium_ore', 'blue_skies:falsite_ore']; + // }); }); From e98262031b99f781432a1084da486657a14a1318 Mon Sep 17 00:00:00 2001 From: Kanzaji ^^ <60540476+Kanzaji@users.noreply.github.com> Date: Sun, 27 Nov 2022 12:50:21 +0100 Subject: [PATCH 38/38] Remove empty files --- kubejs/client_scripts/base/jei_hide_gases.js | 0 kubejs/client_scripts/base/jei_hide_slurries.js | 0 kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js | 0 kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js | 0 kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js | 0 kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js | 0 kubejs/server_scripts/base/tags/items/create/crushed_ores.js | 0 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 kubejs/client_scripts/base/jei_hide_gases.js delete mode 100644 kubejs/client_scripts/base/jei_hide_slurries.js delete mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js delete mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js delete mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js delete mode 100644 kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js delete mode 100644 kubejs/server_scripts/base/tags/items/create/crushed_ores.js diff --git a/kubejs/client_scripts/base/jei_hide_gases.js b/kubejs/client_scripts/base/jei_hide_gases.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/kubejs/client_scripts/base/jei_hide_slurries.js b/kubejs/client_scripts/base/jei_hide_slurries.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/dusts.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/gears.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/plates.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js b/kubejs/server_scripts/base/recipes/emendatusenigmatica/rods.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/kubejs/server_scripts/base/tags/items/create/crushed_ores.js b/kubejs/server_scripts/base/tags/items/create/crushed_ores.js deleted file mode 100644 index e69de29bb..000000000