update bw lib

5 files changed, 23 insertions, 34 deletions

diff --git a/build.gradle b/build.gradle
index 7d22fe252f..d10699dc63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -103,7 +103,7 @@ dependencies {
     }*/
     compile files('GT-PlusPlus-1.7.09.GTNH.jar')
     compile files('libs/TecTech-1.7.10-4.10.6-5fc2d0d2-dev.jar')
-    compile files('libs/bartworks[1.7.10]-[test]-0.5.19-dev.jar')
+    compile files('libs/bartworks[1.7.10]-[c9836c6]-0.5.20-dev.jar')
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
     runtime("eu.usrv:YAMCore:${minecraftVersion}-${yamcoreVersion}:deobf");
 }
diff --git a/libs/bartworks[1.7.10]-[test]-0.5.19-dev.jar b/libs/bartworks[1.7.10]-[c9836c6]-0.5.20-dev.jar
index c528e0a78d..fdf8846aba 100644
--- a/libs/bartworks[1.7.10]-[test]-0.5.19-dev.jar
+++ b/libs/bartworks[1.7.10]-[c9836c6]-0.5.20-dev.jar
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java
index 2eab993878..1d62b9f7d2 100644
--- a/src/main/java/GoodGenerator/Items/MyMaterial.java
+++ b/src/main/java/GoodGenerator/Items/MyMaterial.java
@@ -954,7 +954,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Zr34Sn5Fe2Cr"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems(),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 4),
             OffsetID + 81,
             TextureSet.SET_METALLIC,
             new Pair<>(WerkstoffLoader.Zirconium, 34),
@@ -969,7 +969,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Zr34Sn4FeCrNi"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems(),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 2),
             OffsetID + 82,
             TextureSet.SET_METALLIC,
             new Pair<>(WerkstoffLoader.Zirconium, 34),
@@ -979,13 +979,13 @@ public class MyMaterial implements Runnable {
             new Pair<>(Nickel, 1)
     );
 
-    public static final Werkstoff Incoloy903 = new Werkstoff(
+    public static final Werkstoff incoloy903 = new Werkstoff(
             new short[]{0xa4,0x8f,0x8b},
             "Incoloy-903",
             subscriptNumbers("Fe12Ni10Co8Ti4Mo2Al"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(3700).setGas(true),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems(),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 6),
             OffsetID + 83,
             TextureSet.SET_METALLIC,
             new Pair<>(Iron, 12),
@@ -996,6 +996,20 @@ public class MyMaterial implements Runnable {
             new Pair<>(Aluminium, 1)
     );
 
+    public static final Werkstoff adamantiumAlloy = new Werkstoff(
+            new short[]{0xa0,0xa0,0xa0},
+            "Adamantium Alloy",
+            subscriptNumbers("Ad5Nq2La3"),
+            new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5000).setGas(true),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 3),
+            OffsetID + 84,
+            TextureSet.SET_SHINY,
+            new Pair<>(Adamantium, 5),
+            new Pair<>(Naquadah, 2),
+            new Pair<>(Lanthanum, 3)
+    );
+
     @Override
     public void run() { }
 }
diff --git a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java
index 6cfc48d0cf..9a9b4fd1c0 100644
--- a/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/NaquadahReworkRecipeLoader.java
@@ -514,7 +514,7 @@ public class NaquadahReworkRecipeLoader {
         if (tRecipe != null) {
             GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList.remove(tRecipe);
             GT_Recipe tRecipe2 = tRecipe.copy();
-            tRecipe2.mInputs = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 16), ItemList.Empty_Board_Elite.get(2)};
+            tRecipe2.mInputs = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2)};
             GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList.add(tRecipe2);
             GT_Recipe.GT_Recipe_Map.sChemicalRecipes.reInit();
         }
@@ -528,7 +528,7 @@ public class NaquadahReworkRecipeLoader {
         if (tRecipe != null) {
             GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList.remove(tRecipe);
             GT_Recipe tRecipe2 = tRecipe.copy();
-            tRecipe2.mInputs = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 16), ItemList.Empty_Board_Elite.get(2)};
+            tRecipe2.mInputs = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2)};
             GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList.add(tRecipe2);
             GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.reInit();
         }
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java
index fcbc119064..3a11cddc05 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader_02.java
@@ -29,37 +29,12 @@ public class RecipeLoader_02 {
                 1920
         );
 
-        GT_Values.RA.addMixerRecipe(
-                WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 34),
-                Materials.Tin.getDust(5),
-                Materials.Iron.getDust(2),
-                Materials.Chrome.getDust(1),
-                GT_Utility.getIntegratedCircuit(4),
-                null, null, null,
-                MyMaterial.zircaloy4.get(OrePrefixes.dust, 42),
-                200,
-                120
-        );
-
-        GT_Values.RA.addMixerRecipe(
-                WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 34),
-                Materials.Tin.getDust(4),
-                Materials.Iron.getDust(1),
-                Materials.Chrome.getDust(1),
-                Materials.Nickel.getDust(1),
-                GT_Utility.getIntegratedCircuit(2),
-                 null, null,
-                MyMaterial.zircaloy2.get(OrePrefixes.dust, 41),
-                200,
-                120
-        );
-
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 500, 480, 2800, true);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 513, 480, 2800, false);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 500, 480, 2800, true);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 513, 480, 2800, false);
-        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.Incoloy903, 2400, 1920, 3700, true);
-        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.Incoloy903, 2400, 1920, 3700, true);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.incoloy903, 2400, 1920, 3700, true);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.adamantiumAlloy, 2500, 1920, 5000, true);
 
         GT_Values.RA.addAssemblerRecipe(
                 new ItemStack[] {