Fixes

+ fixed Ross128b crash + fixed TT recipe overlap + fixed double replicator recipes + updated deps
bartimaeusnek · Jun 9, 2020 · 8c4eae3 · 8c4eae3
1 parent ff9f028
commit 8c4eae3
Show file tree

Hide file tree

Showing 7 changed files with 203 additions and 171 deletions.
diff --git a/libs/TecTech-1.7.10-3.8.1-dev.jar → libs/TecTech-1.7.10-3.8.3.jar b/libs/TecTech-1.7.10-3.8.1-dev.jar → libs/TecTech-1.7.10-3.8.3.jar
diff --git a/libs/gregtech-5.09.33.44-dev.jar → libs/gregtech-5.09.33.52-dev.jar b/libs/gregtech-5.09.33.44-dev.jar → libs/gregtech-5.09.33.52-dev.jar
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
@@ -873,7 +873,7 @@ public static void run() {
                 GT_Values.RA.addAssemblerRecipe(
                         new ItemStack[]{
                                 ItemList.Circuit_Parts_GlassFiber.get(32),
-                                GT_OreDictUnificator.get(WerkstoffLoader.gtnhGT ? OrePrefixes.foil : OrePrefixes.plateDouble, Materials.Silver, WerkstoffLoader.gtnhGT ? 8 : 1),
+                                GT_OreDictUnificator.get(WerkstoffLoader.gtnhGT ? OrePrefixes.foil : OrePrefixes.plateDouble, Materials.Electrum, WerkstoffLoader.gtnhGT ? 8 : 1),
                                 WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2)
                         },
                         Materials.Polytetrafluoroethylene.getMolten(72),

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -1732,7 +1732,7 @@ private static void runGTItemDataRegistrator() {
                                 Behaviour_DataOrb.setDataTitle(scannerOutput, "Elemental-Scan");
                                 Behaviour_DataOrb.setDataName(scannerOutput, werkstoff.getToolTip());
                                 GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new BWRecipes.DynamicGTRecipe(false, new ItemStack[]{werkstoff.get(prefixes)}, new ItemStack[]{scannerOutput}, ItemList.Tool_DataOrb.get(1L), null, null, null, (int) (werkstoffBridgeMaterial.getMass() * 8192L), 30, 0));
-                                GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe(false, new BWRecipes.DynamicGTRecipe(false, null, new ItemStack[]{werkstoff.get(prefixes)}, scannerOutput, null, new FluidStack[]{Materials.UUMatter.getFluid(werkstoffBridgeMaterial.getMass())}, null, (int) (werkstoffBridgeMaterial.getMass() * 512L), 30, 0));
+                                //GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe(false, new BWRecipes.DynamicGTRecipe(false, null, new ItemStack[]{werkstoff.get(prefixes)}, scannerOutput, null, new FluidStack[]{Materials.UUMatter.getFluid(werkstoffBridgeMaterial.getMass())}, null, (int) (werkstoffBridgeMaterial.getMass() * 512L), 30, 0));
                             }
                         }
                     }
@@ -2511,7 +2511,7 @@ private static void addCellRecipes(Werkstoff werkstoff) {
             Behaviour_DataOrb.setDataTitle(scannerOutput, "Elemental-Scan");
             Behaviour_DataOrb.setDataName(scannerOutput, werkstoff.getToolTip());
             GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new BWRecipes.DynamicGTRecipe(false, new ItemStack[]{werkstoff.get(cell)}, new ItemStack[]{scannerOutput}, ItemList.Tool_DataOrb.get(1L), null, null, null, (int) (werkstoffBridgeMaterial.getMass() * 8192L), 30, 0));
-            GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe(false, new BWRecipes.DynamicGTRecipe(false, new ItemStack[]{Materials.Empty.getCells(1)}, new ItemStack[]{werkstoff.get(cell)}, scannerOutput, null, new FluidStack[]{Materials.UUMatter.getFluid(werkstoffBridgeMaterial.getMass())}, null, (int) (werkstoffBridgeMaterial.getMass() * 512L), 30, 0));
+            //GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe(false, new BWRecipes.DynamicGTRecipe(false, new ItemStack[]{Materials.Empty.getCells(1)}, new ItemStack[]{werkstoff.get(cell)}, scannerOutput, null, new FluidStack[]{Materials.UUMatter.getFluid(werkstoffBridgeMaterial.getMass())}, null, (int) (werkstoffBridgeMaterial.getMass() * 512L), 30, 0));
         }
     }