From 2af6bc660172d55f57c380864f8ca151b264acdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= <niels.pilgaard@hotmail.com> Date: Sun, 3 Jan 2021 22:48:17 +0100 Subject: [PATCH 1/5] Update additions.js --- .../kubejs/base/unification/additions.js | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/unification/additions.js b/kubejs/server_scripts/enigmatica/kubejs/base/unification/additions.js index 6fed08f0f1..88e7ee257f 100644 --- a/kubejs/server_scripts/enigmatica/kubejs/base/unification/additions.js +++ b/kubejs/server_scripts/enigmatica/kubejs/base/unification/additions.js @@ -71,7 +71,10 @@ function bloodmagic_ore_processing_arc(event, material) { return; } - var data; + var data = { + recipes: [] + }; + var gemTag = ingredient.of('#forge:gems/' + material); var gem = getPreferredItemInTag(gemTag).id; @@ -85,17 +88,13 @@ function bloodmagic_ore_processing_arc(event, material) { var dust = getPreferredItemInTag(dustTag).id; if (gem != air) { - data = { - recipes: [ - { - input: 'forge:ores/' + material, - output: gem, - count: 5, - bonus: [], - tool: 'bloodmagic:arc/cuttingfluid' - } - ] - }; + data.recipes.push({ + input: 'forge:ores/' + material, + output: gem, + count: 5, + bonus: [], + tool: 'bloodmagic:arc/cuttingfluid' + }); } else if (dust != air) { data.recipes.push({ input: 'forge:ores/' + material, From 2c6f04d6bca4dea54d9e9b66d47d86522a0db8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= <niels.pilgaard@hotmail.com> Date: Sun, 3 Jan 2021 23:04:55 +0100 Subject: [PATCH 2/5] removed duplicate aluminum recipe --- config/jaopca/main.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jaopca/main.toml b/config/jaopca/main.toml index 6797fc3b57..cbf3e9ba1f 100644 --- a/config/jaopca/main.toml +++ b/config/jaopca/main.toml @@ -58,7 +58,7 @@ #Configurations related to recipes. [recipes] #List of recipes that should not be added. - blacklist = ["jaopca:mekanism.material_to_dust.prismarine", "jaopca:mekanism.ore_to_material.dimensional"] + blacklist = ["jaopca:mekanism.material_to_dust.prismarine", "jaopca:mekanism.ore_to_material.dimensional", "jaopca:thermal_expansion.ore_to_material.aluminum"] #Configurations related to loot tables. [lootTables] From 2a427979bfadab7485a563a38d084fd85e1b9ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= <niels.pilgaard@hotmail.com> Date: Sun, 3 Jan 2021 23:05:17 +0100 Subject: [PATCH 3/5] buffed Refined Storage wireless transmitter range, increased energy usage, fixes #693 --- config/serverconfigupdater-common.toml | 2 +- defaultconfigs/refinedstorage-server.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/serverconfigupdater-common.toml b/config/serverconfigupdater-common.toml index 209952c2f5..5ef502164c 100644 --- a/config/serverconfigupdater-common.toml +++ b/config/serverconfigupdater-common.toml @@ -1,7 +1,7 @@ ["Add New Version"] #ModID's of the ServerConfigs that will be deleted when a world with a version lower than this version is loaded the first time. Comma Separated list. (ServerConfig without -server.toml) - toDelete = "rftoolsutility, immersiveengineering, astralsorcery, rftoolsbase" + toDelete = "rftoolsutility, immersiveengineering, astralsorcery, rftoolsbase, refinedstorage" #Version Number. VersionNumbers are simple Integers. Use a number larger than the last version. #Range: > 0 newVersion = 1 diff --git a/defaultconfigs/refinedstorage-server.toml b/defaultconfigs/refinedstorage-server.toml index 84c59711bb..f07e4c5bfa 100644 --- a/defaultconfigs/refinedstorage-server.toml +++ b/defaultconfigs/refinedstorage-server.toml @@ -158,13 +158,13 @@ [wirelessTransmitter] #The energy used by the Wireless Transmitter #Range: > 0 - usage = 8 + usage = 20 #The base range of the Wireless Transmitter #Range: > 0 - baseRange = 16 + baseRange = 32 #The additional range per Range Upgrade in the Wireless Transmitter #Range: > 0 - rangePerUpgrade = 8 + rangePerUpgrade = 24 [storageMonitor] #The energy used by the Storage Monitor From 8089db0b429d7eb329c6ccb13416c15e903d51b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= <niels.pilgaard@hotmail.com> Date: Sun, 3 Jan 2021 23:22:01 +0100 Subject: [PATCH 4/5] add TODO: Remove tag --- kubejs/startup_scripts/functions.js | 1 + kubejs/startup_scripts/global_constants.js | 1 + kubejs/startup_scripts/materialsystem.js | 1 + 3 files changed, 3 insertions(+) diff --git a/kubejs/startup_scripts/functions.js b/kubejs/startup_scripts/functions.js index f79b0fcbe7..175f9135e6 100644 --- a/kubejs/startup_scripts/functions.js +++ b/kubejs/startup_scripts/functions.js @@ -1,3 +1,4 @@ +//TODO: Remove // //priority: 1000 // function material(n, c, i, b) { diff --git a/kubejs/startup_scripts/global_constants.js b/kubejs/startup_scripts/global_constants.js index aeb48616b3..2ae276f384 100644 --- a/kubejs/startup_scripts/global_constants.js +++ b/kubejs/startup_scripts/global_constants.js @@ -1,3 +1,4 @@ +//TODO: Remove // const disabledItems = [ // 'aquaculture:wooden_fillet_knife', // 'aquaculture:stone_fillet_knife', diff --git a/kubejs/startup_scripts/materialsystem.js b/kubejs/startup_scripts/materialsystem.js index feb1667455..e1ea892eb0 100644 --- a/kubejs/startup_scripts/materialsystem.js +++ b/kubejs/startup_scripts/materialsystem.js @@ -1,3 +1,4 @@ +//TODO: Remove // //priority: 999 // var oreBlock = blockWithProperties('ore', block.material.rock, TOOL_TYPE_PICKAXE, 1, 3.0, 20.0); From 070b25d0ca640638173d4cfdee4dcf7b7d68f227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?= <niels.pilgaard@hotmail.com> Date: Sun, 3 Jan 2021 23:22:17 +0100 Subject: [PATCH 5/5] Removed granite and diorite from worldgen, 1/2 of #698 --- kubejs/startup_scripts/worldgen/remove.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 kubejs/startup_scripts/worldgen/remove.js diff --git a/kubejs/startup_scripts/worldgen/remove.js b/kubejs/startup_scripts/worldgen/remove.js new file mode 100644 index 0000000000..dba3f8dae8 --- /dev/null +++ b/kubejs/startup_scripts/worldgen/remove.js @@ -0,0 +1,5 @@ +events.listen('worldgen.remove', (event) => { + event.removeOres((ores) => { + ores.blocks = ['minecraft:granite', 'minecraft:diorite']; + }); +});