Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 …

…into develop
EnigmaticaModpacks · Jan 3, 2021 · be9e81f · be9e81f
2 parents 2fb9f50 + 070b25d
commit be9e81f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 17 deletions.
diff --git 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]

diff --git 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
@@ -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

diff --git 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,

diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+//TODO: Remove
 // //priority: 999
 
 // var oreBlock = blockWithProperties('ore', block.material.rock, TOOL_TYPE_PICKAXE, 1, 3.0, 20.0);

diff --git a/kubejs/startup_scripts/worldgen/remove.js 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'];
+    });
+});