Also fix Nether Metals harvest levels/mining levels

SlimeKnights · Aug 14, 2014 · 993e524 · 993e524
1 parent 9dfc28c
commit 993e524
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/src/main/java/iguanaman/iguanatweakstconstruct/harvestlevels/HarvestLevelTweaks.java b/src/main/java/iguanaman/iguanatweakstconstruct/harvestlevels/HarvestLevelTweaks.java
@@ -196,15 +196,15 @@ private static void modifyTools()
             // 1: Flint
             {},
             // 2: Copper
-            {},
+            {"Lemurite", "Ignatius"},
             // 3: Iron
-            {"Lemurite"},
+            {"ShadowIron"},
             // 4: Bronze
-            {"Ignatius", "ShadowIron"},
-            // 5: Redstone/Diamond
             {"Midasium", "Vyroxeres"},
+            // 5: Redstone/Diamond
+            {"Ceruclase"},
             // 6: Obsidian/Alumite
-            {"Ceruclase", "Alduorite"},
+            {"Alduorite"},
             // 7: Ardite
             {"Kalendrite"},
             // 8: Cobalt

diff --git a/src/main/java/iguanaman/iguanatweakstconstruct/harvestlevels/TinkerMaterialTweaks.java b/src/main/java/iguanaman/iguanatweakstconstruct/harvestlevels/TinkerMaterialTweaks.java
@@ -152,33 +152,19 @@ private static void modifyMetallurgyFantasy(int bronzeLevel)
         updateMaterial(_9_manyullym, "Adamantine",  1550,1000, 5, 2.3f); // Reinforced 2
         updateMaterial(_9_manyullym, "Atlarus",     1750,1200, 5, 2.5f);
         updateMaterial(_9_manyullym, "Tartarite",   2000,1500, 6, 3.33f); // Adamantine + Atlarus
-
-            /*
-    Stat Baseline:
-    0 - Stone:      100, 200, 1, 0.5
-    1 - Flint:      150, 400, 2, 0.5
-    2 - Copper:     200, 500, 2, 1.0
-    3 - Iron:       300, 600, 3, 1.1
-    4 - Bronze:     400, 650, 3, 1.2
-    5 - Diamond:    450, 700, 3, 1.3
-    6 - Obsidian:   500, 800, 3, 1.3
-    7 - Ardite:     600, 850, 4, 1.7
-    8 - Cobalt      800,1000, 4, 1.9
-    9 - Manyullyn: 1100, 900, 5, 2.5
-     */
     }
 
     private static void modifyMetallurgyNether(int bronzeLevel)
     {
-        updateMaterial(bronzeLevel, "Ignatius",     200, 400, 3, 0.3f); // Ignite 1
-        updateMaterial(bronzeLevel, "Shadow Iron",  300, 400, 3, 1.2f); // Weakness 1 + Reinforced 1
+        updateMaterial(_3_iron,     "Ignatius",     200, 400, 3, 0.3f); // Ignite 1
+        updateMaterial(_3_iron,     "Shadow Iron",  300, 400, 3, 1.2f); // Weakness 1 + Reinforced 1
         updateMaterial(bronzeLevel, "Shadow Steel", 400, 600, 4, 1.3f); // Shadow Iron + Lemurite, Weakness 2 + Reinforced 2
         updateMaterial(_5_diamond,  "Midasium",     111,1111, 4, 1.1f);
         updateMaterial(_5_diamond,  "Vyroxeres",    300, 700, 3, 0.8f); // Poison 1
         updateMaterial(_6_obsidian, "Ceruclase",    500, 707, 4, 1.4f);
-        updateMaterial(_6_obsidian, "Inolashite",   900, 800, 3, 0.81f); // Alduorite + Ceruclase, Poison 2
+        updateMaterial(_7_ardite,   "Inolashite",   900, 800, 3, 0.81f); // Alduorite + Ceruclase, Poison 2
         updateMaterial(_7_ardite,   "Kalendrite",  1000, 500, 4, 1.1f);
-        updateMaterial(_7_ardite,   "Amordrine",    900,1400, 3, 1.0f); // Kalendrite + Platinum, Life Steal 1
+        updateMaterial(_8_cobalt,   "Amordrine",    900,1400, 3, 1.0f); // Kalendrite + Platinum, Life Steal 1
         updateMaterial(_8_cobalt,   "Vulcanite",   1500,1000, 4, 0.7f); // Ignite 2
         updateMaterial(_8_cobalt,   "Sanguinite",   150, 200, 6, 0.5f); // Wither 1, Combat material. Requires manyullyn to mine, but can't mine it
     }