From 6c77637f2596e236a8fea4ca922e652189b121c2 Mon Sep 17 00:00:00 2001
From: Unknown <lemadec.fr@gmail.com>
Date: Tue, 20 Aug 2019 00:58:43 +0200
Subject: [PATCH] Updated default configuration

- filler sets for Metallurgy integration
- enable LHC
- scanner range should cover frigates
---
 .../warpdrive/config/WarpDriveConfig.java     |  4 +-
 .../resources/config/fillerSets-default.xml   | 56 +++++++++----------
 .../config/fillerSets-undergroundbiomes.xml   | 36 ++++++------
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java b/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
index 4ed400c5..ea0cafe1 100644
--- a/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
+++ b/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
@@ -305,7 +305,7 @@ public class WarpDriveConfig {
 	public static float[]          SIREN_RANGE_BLOCKS_BY_TIER = { 0.0F, 32.0F, 64.0F, 128.0F };
 	
 	// Ship Scanner
-	public static int              SS_MAX_DEPLOY_RADIUS_BLOCKS = 50;
+	public static int              SS_MAX_DEPLOY_RADIUS_BLOCKS = 100;
 	public static int              SS_SEARCH_INTERVAL_TICKS = 20;
 	public static int              SS_SCAN_BLOCKS_PER_SECOND = 10;
 	public static int              SS_DEPLOY_BLOCKS_PER_INTERVAL = 10;
@@ -532,7 +532,7 @@ public class WarpDriveConfig {
 	public static HashMap<String, IBlockTransformer> blockTransformers = new HashMap<>(30);
 	
 	// Particles accelerator
-	public static boolean          ACCELERATOR_ENABLE = false;
+	public static boolean          ACCELERATOR_ENABLE = true;
 	public static final double[]   ACCELERATOR_TEMPERATURES_K = { 270.0, 200.0, 7.0 };
 	public static final double     ACCELERATOR_THRESHOLD_DEFAULT = 0.95D;
 	public static int              ACCELERATOR_MAX_PARTICLE_BUNCHES = 20;
diff --git a/src/main/resources/config/fillerSets-default.xml b/src/main/resources/config/fillerSets-default.xml
index 1317d20e..837533ae 100644
--- a/src/main/resources/config/fillerSets-default.xml
+++ b/src/main/resources/config/fillerSets-default.xml
@@ -46,17 +46,17 @@
 		<filler block="forestry:resources" metadata="0" ratio=".036" mods="forestry" /><!-- Apatite -->
 		<filler block="LanteaCraft:blockLanteaOre" metadata="2" ratio=".008" mods="LanteaCraft" /><!-- Trinium -->
 		<filler block="mekanism:oreblock" metadata="0" ratio=".004" mods="mekanism" /><!-- Osmium -->
-		<filler block="Metallurgy:base.ore" metadata="2" ratio=".008" mods="Metallurgy" /><!-- Manganese -->
-		<filler block="Metallurgy:fantasy.ore" metadata="0" ratio=".020" mods="Metallurgy" /><!-- Prometheum -->
-		<filler block="Metallurgy:fantasy.ore" metadata="1" ratio=".012" mods="Metallurgy" /><!-- Deep Iron -->
-		<filler block="Metallurgy:fantasy.ore" metadata="2" ratio=".012" mods="Metallurgy" /><!-- Infuscolium -->
-		<filler block="Metallurgy:fantasy.ore" metadata="4" ratio=".008" mods="Metallurgy" /><!-- Oureclase -->
-		<filler block="Metallurgy:utility.ore" metadata="0" ratio=".006" mods="Metallurgy" /><!-- Sulfur -->
-		<filler block="Metallurgy:utility.ore" metadata="1" ratio=".006" mods="Metallurgy" /><!-- Phosphorite -->
-		<filler block="Metallurgy:utility.ore" metadata="2" ratio=".007" mods="Metallurgy" /><!-- Saltpeter -->
-		<filler block="Metallurgy:utility.ore" metadata="3" ratio=".006" mods="Metallurgy" /><!-- Magnesium -->
-		<filler block="Metallurgy:utility.ore" metadata="4" ratio=".006" mods="off,Metallurgy" /><!-- Bitumen -->
-		<filler block="Metallurgy:utility.ore" metadata="5" ratio=".006" mods="Metallurgy" /><!-- Potash -->
+		<filler block="metallurgy:manganese_ore"   metadata="0" ratio=".008" mods="metallurgy" /><!-- Manganese -->
+		<filler block="metallurgy:prometheum_ore"  metadata="0" ratio=".020" mods="metallurgy" /><!-- Prometheum -->
+		<filler block="metallurgy:deep_iron_ore"   metadata="0" ratio=".012" mods="metallurgy" /><!-- Deep Iron -->
+		<filler block="metallurgy:infuscolium_ore" metadata="0" ratio=".012" mods="metallurgy" /><!-- Infuscolium -->
+		<filler block="metallurgy:oureclase_ore"   metadata="0" ratio=".008" mods="metallurgy" /><!-- Oureclase -->
+		<filler block="metallurgy:sulfur_ore"      metadata="0" ratio=".006" mods="metallurgy" /><!-- Sulfur -->
+		<filler block="metallurgy:phosphorite_ore" metadata="0" ratio=".006" mods="metallurgy" /><!-- Phosphorite -->
+		<filler block="metallurgy:saltpeter_ore"   metadata="0" ratio=".007" mods="metallurgy" /><!-- Saltpeter -->
+		<filler block="metallurgy:magnesium_ore"   metadata="0" ratio=".006" mods="metallurgy" /><!-- Magnesium -->
+		<filler block="metallurgy:bitumen_ore"     metadata="0" ratio=".006" mods="metallurgy" /><!-- Bitumen -->
+		<filler block="metallurgy:potash_ore"      metadata="0" ratio=".006" mods="metallurgy" /><!-- Potash -->
 		<filler block="mysticalagriculture:inferium_ore" metadata="0" ratio=".012" mods="mysticalagriculture" /><!-- Inferium -->
 		
 		<filler block="thermalfoundation:ore"    metadata="4" ratio=".032" mods="thermalfoundation" /><!-- Aluminum -->
@@ -117,10 +117,10 @@
 		<filler block="LanteaCraft:blockLanteaOre" metadata="0" ratio=".005" mods="LanteaCraft" /><!-- Naquadah -->
 		<filler block="libvulpes:ore0" metadata="0" ratio=".008" mods="libvulpes" /><!-- Dilithium -->
 		<filler block="mekanism:oreblock" metadata="0" ratio=".010" mods="mekanism" /><!-- Osmium -->
-		<filler block="Metallurgy:fantasy.ore" metadata="5" ratio=".008" mods="Metallurgy" /><!-- Astral Silver -->
-		<filler block="Metallurgy:fantasy.ore" metadata="6" ratio=".0064" mods="Metallurgy" /><!-- Carmot -->
-		<filler block="Metallurgy:fantasy.ore" metadata="8" ratio=".004" mods="Metallurgy" /><!-- Rubracium -->
-		<filler block="Metallurgy:precious.ore" metadata="0" ratio=".015" mods="Metallurgy" /><!-- Zinc -->
+		<filler block="metallurgy:astral_silver_ore" metadata="5" ratio=".008"  mods="metallurgy" /><!-- Astral Silver -->
+		<filler block="metallurgy:carmort_ore"       metadata="6" ratio=".0064" mods="metallurgy" /><!-- Carmot -->
+		<filler block="metallurgy:rubracium_ore"     metadata="8" ratio=".004"  mods="metallurgy" /><!-- Rubracium -->
+		<filler block="metallurgy:zinc_ore"          metadata="0" ratio=".015"  mods="metallurgy" /><!-- Zinc -->
 		<filler block="mysticalagriculture:prosperity_ore" metadata="0" ratio=".008" mods="mysticalagriculture" /><!-- Prosperity -->
 		<filler block="nuclearcraft:ore" metadata="3" ratio=".002" mods="nuclearcraft" /><!-- Thorium -->
 		<filler block="nuclearcraft:ore" metadata="5" ratio=".004" mods="nuclearcraft" /><!-- Boron -->
@@ -202,9 +202,9 @@
 		<filler block="arsmagica2:vinteumOre" metadata="2" ratio=".008" mods="arsmagica2" /><!-- Blue topaz -->
 		<filler block="draconicevolution:draconium_ore" metadata="0" ratio="0.004" mods="off,draconicevolution" /><!-- Draconium -->
 		<filler block="LanteaCraft:blockLanteaOre" metadata="1" ratio=".006" mods="LanteaCraft" /><!-- Naquadriah -->
-		<filler block="Metallurgy:fantasy.ore" metadata="11" ratio=".006" mods="Metallurgy" /><!-- Orichalcum -->
-		<filler block="Metallurgy:fantasy.ore" metadata="13" ratio=".004" mods="Metallurgy" /><!-- Adamantine -->
-		<filler block="Metallurgy:fantasy.ore" metadata="14" ratio=".004" mods="Metallurgy" /><!-- Atlarus -->
+		<filler block="metallurgy:orichalcum_ore" metadata="0" ratio=".006" mods="metallurgy" /><!-- Orichalcum -->
+		<filler block="metallurgy:adamantine_ore" metadata="0" ratio=".004" mods="metallurgy" /><!-- Adamantine -->
+		<filler block="metallurgy:atlarus_ore"    metadata="0" ratio=".004" mods="metallurgy" /><!-- Atlarus -->
 		<filler block="nuclearcraft:ore" metadata="3" ratio=".015" mods="nuclearcraft" /><!-- Thorium -->
 		<filler block="nuclearcraft:ore" metadata="5" ratio=".030" mods="nuclearcraft" /><!-- Boron -->
 		<filler block="nuclearcraft:ore" metadata="6" ratio=".020" mods="nuclearcraft" /><!-- Lithium -->
@@ -241,16 +241,16 @@
 		<filler block="draconicevolution:draconium_ore" metadata="1" ratio="0.004" mods="draconicevolution" /><!-- Draconium -->
 		<filler block="deepresonance:resonating_ore" metadata="1" ratio="0.0028" mods="deepresonance" />
 		<filler block="deepresonance:resonating_crystal" ratio="0.0005" mods="deepresonance" />
-		<filler block="Metallurgy:nether.ore" metadata="0" ratio=".036" mods="Metallurgy" /><!-- Ignatius -->
-		<filler block="Metallurgy:nether.ore" metadata="1" ratio=".028" mods="Metallurgy" /><!-- Shadow Iron -->
-		<filler block="Metallurgy:nether.ore" metadata="2" ratio=".024" mods="Metallurgy" /><!-- Lemurite -->
-		<filler block="Metallurgy:nether.ore" metadata="3" ratio=".020" mods="Metallurgy" /><!-- Midasium -->
-		<filler block="Metallurgy:nether.ore" metadata="4" ratio=".018" mods="Metallurgy" /><!-- Vyroxeres -->
-		<filler block="Metallurgy:nether.ore" metadata="5" ratio=".010" mods="Metallurgy" /><!-- Ceruclase -->
-		<filler block="Metallurgy:nether.ore" metadata="6" ratio=".008" mods="Metallurgy" /><!-- Alduorite -->
-		<filler block="Metallurgy:nether.ore" metadata="7" ratio=".008" mods="Metallurgy" /><!-- Kalendrite -->
-		<filler block="Metallurgy:nether.ore" metadata="8" ratio=".012" mods="Metallurgy" /><!-- Vulcanite -->
-		<filler block="Metallurgy:nether.ore" metadata="9" ratio=".005" mods="Metallurgy" /><!-- Sanguinite -->
+		<filler block="metallurgy:ignatius_ore"    metadata="0" ratio=".036" mods="metallurgy" /><!-- Ignatius -->
+		<filler block="metallurgy:shadow_iron_ore" metadata="0" ratio=".028" mods="metallurgy" /><!-- Shadow Iron -->
+		<filler block="metallurgy:lemurite_ore"    metadata="0" ratio=".024" mods="metallurgy" /><!-- Lemurite -->
+		<filler block="metallurgy:midasium_ore"    metadata="0" ratio=".020" mods="metallurgy" /><!-- Midasium -->
+		<filler block="metallurgy:vyroxeres_ore"   metadata="0" ratio=".018" mods="metallurgy" /><!-- Vyroxeres -->
+		<filler block="metallurgy:ceruclase_ore"   metadata="0" ratio=".010" mods="metallurgy" /><!-- Ceruclase -->
+		<filler block="metallurgy:alduorite_ore"   metadata="0" ratio=".008" mods="metallurgy" /><!-- Alduorite -->
+		<filler block="metallurgy:kalendrite_ore"  metadata="0" ratio=".008" mods="metallurgy" /><!-- Kalendrite -->
+		<filler block="metallurgy:vulcanite_ore"   metadata="0" ratio=".012" mods="metallurgy" /><!-- Vulcanite -->
+		<filler block="metallurgy:sanguinite_ore"  metadata="0" ratio=".005" mods="metallurgy" /><!-- Sanguinite -->
 		<filler block="mysticalagriculture:nether_inferium_ore" metadata="0" ratio=".008" mods="mysticalagriculture" /><!-- Inferium -->
 		<filler block="mysticalagriculture:nether_prosperity_ore" metadata="0" ratio=".004" mods="mysticalagriculture" /><!-- Prosperity -->
 		<filler block="nex:amethyst_ore" ratio="0.009" mods="nex" />
diff --git a/src/main/resources/config/fillerSets-undergroundbiomes.xml b/src/main/resources/config/fillerSets-undergroundbiomes.xml
index 8aea8097..1554e143 100644
--- a/src/main/resources/config/fillerSets-undergroundbiomes.xml
+++ b/src/main/resources/config/fillerSets-undergroundbiomes.xml
@@ -27,17 +27,17 @@
 				<filler block="undergroundbiomes:%type%_stone_forestry_resources" metadata="%metadata%" ratio=".036" mods="forestry" /><!-- Apatite -->
 				<filler block="LanteaCraft:blockLanteaOre" metadata="2" ratio=".008" mods="LanteaCraft" /><!-- Trinium -->
 				<filler block="undergroundbiomes:%type%_stone_mekanism_oreblock" metadata="%metadata%" ratio=".004" mods="mekanism" /><!-- Osmium -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.base.ore.2" metadata="%metadata%" ratio=".008" mods="Metallurgy" /><!-- Manganese -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore" metadata="%metadata%" ratio=".020" mods="Metallurgy" /><!-- Prometheum -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.1" metadata="%metadata%" ratio=".012" mods="Metallurgy" /><!-- Deep Iron -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.2" metadata="%metadata%" ratio=".012" mods="Metallurgy" /><!-- Infuscolium -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.4" metadata="%metadata%" ratio=".008" mods="Metallurgy" /><!-- Oureclase -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Sulfur -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.1" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Phosphorite -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.2" metadata="%metadata%" ratio=".007" mods="Metallurgy" /><!-- Saltpeter -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.3" metadata="%metadata%" ratio=".006" mods="Metallurgy,!voltzengine" /><!-- Magnesium -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.4" metadata="%metadata%" ratio=".006" mods="off,Metallurgy" /><!-- Bitumen -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.utility.ore.5" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Potash -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_manganese_ore"   metadata="%metadata%" ratio=".008" mods="metallurgy" /><!-- Manganese -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_prometheum_ore"  metadata="%metadata%" ratio=".020" mods="metallurgy" /><!-- Prometheum -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_deep_iron_ore"   metadata="%metadata%" ratio=".012" mods="metallurgy" /><!-- Deep Iron -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_infuscolium_ore" metadata="%metadata%" ratio=".012" mods="metallurgy" /><!-- Infuscolium -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_oureclase_ore"   metadata="%metadata%" ratio=".008" mods="metallurgy" /><!-- Oureclase -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_sulfur_ore"      metadata="%metadata%" ratio=".006" mods="metallurgy" /><!-- Sulfur -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_phosphorite_ore" metadata="%metadata%" ratio=".006" mods="metallurgy" /><!-- Phosphorite -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_saltpeter_ore"   metadata="%metadata%" ratio=".007" mods="removed,metallurgy" /><!-- Saltpeter (removed in 1.12+, kept for reference ratio) -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_magnesium_ore"   metadata="%metadata%" ratio=".006" mods="removed,metallurgy" /><!-- Magnesium (removed in 1.12+, kept for reference ratio) -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_bitumen_ore"     metadata="%metadata%" ratio=".006" mods="off,metallurgy" /><!-- Bitumen (replaced with lakes in 1.12+, kept for reference ratio) -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_potash_ore"      metadata="%metadata%" ratio=".006" mods="off,metallurgy" /><!-- Potash -->
 				<filler block="undergroundbiomes:%type%_stone_mysticalagriculture_inferium_ore" metadata="%metadata%" ratio=".012" mods="mysticalagriculture" /><!-- Inferium -->
 				
 				<filler block="undergroundbiomes:%type%_stone_tile.thermalfoundation.ore.aluminum.name" metadata="%metadata%" ratio=".032" mods="thermalfoundation" /><!-- Aluminum -->
@@ -82,10 +82,10 @@
 				<filler block="undergroundbiomes:%type%_stone_arsmagica2:ores.1" metadata="%metadata%" ratio=".006" mods="arsmagica2" /><!-- Chimerite -->
 				<filler block="undergroundbiomes:%type%_stone_deepresonance_resonating_ore" metadata="%metadata%" ratio=".001" mods="deepresonance" /><!-- Resonating -->
 				<filler block="undergroundbiomes:%type%_stone_mekanism_oreblock" metadata="%metadata%" ratio=".010" mods="mekanism" /><!-- Osmium -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.5" metadata="%metadata%" ratio=".008" mods="Metallurgy" /><!-- Astral Silver -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.6" metadata="%metadata%" ratio=".0064" mods="Metallurgy" /><!-- Carmot -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.fantasy.ore.8" metadata="%metadata%" ratio=".004" mods="Metallurgy" /><!-- Rubracium -->
-				<filler block="undergroundbiomes:%type%_stone_metal.block.precious.ore" metadata="%metadata%" ratio=".015" mods="Metallurgy" /><!-- Zinc -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_astral_silver_ore"           metadata="%metadata%" ratio=".008" mods="metallurgy" /><!-- Astral Silver -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_carmot_ore"                  metadata="%metadata%" ratio=".0064" mods="metallurgy" /><!-- Carmot -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_rubracium_ore"               metadata="%metadata%" ratio=".004" mods="metallurgy" /><!-- Rubracium -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_zinc_ore"                    metadata="%metadata%" ratio=".015" mods="metallurgy" /><!-- Zinc -->
 				<filler block="undergroundbiomes:%type%_stone_tile.nuclearcraft.ore.thorium"   metadata="%metadata%" ratio=".002" mods="nuclearcraft" /><!-- Thorium -->
 				<filler block="undergroundbiomes:%type%_stone_tile.nuclearcraft.ore.boron"     metadata="%metadata%" ratio=".004" mods="nuclearcraft" /><!-- Boron -->
 				<filler block="undergroundbiomes:%type%_stone_tile.nuclearcraft.ore.lithium"   metadata="%metadata%" ratio=".003" mods="nuclearcraft" /><!-- Lithium -->
@@ -157,9 +157,9 @@
 				<filler block="undergroundbiomes:%type%_arsmagica2:ores.2" metadata="%metadata%" ratio=".008" mods="arsmagica2" /><!-- Blue topaz -->
 				<filler block="undergroundbiomes:%type%_stone_draconicevolution_draconium_ore" metadata="%metadata%" ratio="0.004" mods="off,draconicevolution" /><!-- Draconium -->
 				<filler block="LanteaCraft:blockLanteaOre" metadata="1" ratio=".006" mods="LanteaCraft" /><!-- Naquadriah -->
-				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.11" metadata="%metadata%" ratio=".006" mods="Metallurgy" /><!-- Orichalcum -->
-				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.13" metadata="%metadata%" ratio=".004" mods="Metallurgy" /><!-- Adamantine -->
-				<filler block="undergroundbiomes:%type%_metal.block.fantasy.ore.14" metadata="%metadata%" ratio=".004" mods="Metallurgy" /><!-- Atlarus -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_orichalcum_ore"              metadata="%metadata%" ratio=".006" mods="metallurgy" /><!-- Orichalcum -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_adamantine_ore"              metadata="%metadata%" ratio=".004" mods="metallurgy" /><!-- Adamantine -->
+				<filler block="undergroundbiomes:%type%_stone_metallurgy_atlarus_ore"                 metadata="%metadata%" ratio=".004" mods="metallurgy" /><!-- Atlarus -->
 				<filler block="undergroundbiomes:%type%_stone_tile.nuclearcraft.ore.thorium"   metadata="%metadata%" ratio=".015" mods="nuclearcraft" /><!-- Thorium -->
 				<filler block="undergroundbiomes:%type%_stone_tile.nuclearcraft.ore.boron"     metadata="%metadata%" ratio=".030" mods="nuclearcraft" /><!-- Boron -->
 				<filler block="undergroundbiomes:%type%_stone_tile.nuclearcraft.ore.lithium"   metadata="%metadata%" ratio=".020" mods="nuclearcraft" /><!-- Lithium -->