diff options
Diffstat (limited to 'src')
7 files changed, 48 insertions, 33 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java index 80a51d80cc..f61a2096b7 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -406,7 +406,7 @@ public class GenericChem extends ItemPackage { }, 20 *60, 120, - 2); + 4); //Sodium ethyl xanthate - CH3CH2ONa + CS2 → CH3CH2OCS2Na CORE.RA.addChemicalPlantRecipe( @@ -425,7 +425,7 @@ public class GenericChem extends ItemPackage { }, 20 *60, 120, - 2); + 4); } @@ -869,7 +869,7 @@ public class GenericChem extends ItemPackage { }, 20 * 30, 500, - 3); + 4); } @@ -891,7 +891,7 @@ public class GenericChem extends ItemPackage { }, 20 * 15, 120, - 1); + 2); /*GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4), @@ -922,7 +922,7 @@ public class GenericChem extends ItemPackage { }, 20 * 40, 120, - 1); + 2); /*GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("platePalladium", 0), diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 71bf2f3e6f..8c6e66fcb8 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -629,7 +629,7 @@ public class MilledOreProcessing extends ItemPackage { }, 20 * 60, 120, - 2); + 3); CORE.RA.addChemicalPlantRecipe( new ItemStack[] { @@ -653,7 +653,7 @@ public class MilledOreProcessing extends ItemPackage { }, 20 * 45, 120, - 3); + 4); } @@ -683,7 +683,7 @@ public class MilledOreProcessing extends ItemPackage { aChances, aTime * 20, aEU, - 1); + 3); } public static ItemStack[] cleanArray(ItemStack[] input) { diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 719e5145e9..c91efd4ec8 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -118,7 +118,7 @@ public class RocketFuels extends ItemPackage { new int[]{100, 100, 50, 50}, 20*30, MaterialUtils.getVoltageForTier(3), - 2); + 3); } @@ -276,7 +276,7 @@ public class RocketFuels extends ItemPackage { }, 20 * 60, 120, - 2); + 3); } @@ -388,7 +388,7 @@ public class RocketFuels extends ItemPackage { }, 20 * 30, 240, - 3); + 4); // Monomethylhydrazine_Plus_Nitric_Acid @@ -409,7 +409,7 @@ public class RocketFuels extends ItemPackage { }, 20 * 45, 480, - 3); + 5); // Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide @@ -430,7 +430,7 @@ public class RocketFuels extends ItemPackage { }, 20 * 60, 480, - 3); + 5); } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index ea1bcdb9de..7fff2b09ba 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -177,7 +177,7 @@ public class RECIPES_GREGTECH { }, 20 * 30, MaterialUtils.getVoltageForTier(3), - 2); + 3); // Produce Th232 CORE.RA.addChemicalPlantRecipe( @@ -203,7 +203,7 @@ public class RECIPES_GREGTECH { }, 20 * 300, MaterialUtils.getVoltageForTier(4), - 3); + 4); } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 6c6eedfb54..9d6cffdde3 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -338,7 +338,7 @@ public class RECIPES_Machines { }, 20 * 600, MaterialUtils.getVoltageForTier(6), - 3); + 5); } diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 490b94d71c..077b397f88 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -595,7 +595,7 @@ public class BioRecipes { }, 60 * 20, 2, - 1); + 0); } } @@ -617,7 +617,7 @@ public class BioRecipes { }, 60 * 20, 2, - 1); + 0); } } @@ -638,7 +638,7 @@ public class BioRecipes { }, 90 * 20, 30, - 1); + 0); CORE.RA.addChemicalPlantRecipe( new ItemStack[] { @@ -657,7 +657,7 @@ public class BioRecipes { }, 120 * 20, 30, - 1); + 0); // Sugar Beet if (OreDictUtils.containsValidEntries("cropSugarbeet")) { @@ -678,7 +678,7 @@ public class BioRecipes { }, 60 * 20, 30, - 1); + 0); CORE.RA.addChemicalPlantRecipe( new ItemStack[] { @@ -697,7 +697,7 @@ public class BioRecipes { }, 90 * 20, 30, - 1); + 0); } // Produce Acetone, Butanol and Ethanol @@ -720,9 +720,9 @@ public class BioRecipes { new FluidStack[] { }, - 900 * 20, + 450 * 20, 32, - 2); + 1); } @@ -1212,7 +1212,7 @@ public class BioRecipes { }, 120 * 20, 60, - 2); + 1); } aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertIC2, 2); @@ -1233,7 +1233,7 @@ public class BioRecipes { }, 120 * 20, 60, - 2); + 1); } @@ -1275,7 +1275,7 @@ public class BioRecipes { }, 60 * 20, 60, - 2); + 1); } private static void recipeBenzene() { @@ -1315,7 +1315,7 @@ public class BioRecipes { }, 16 * 20, 480, - 3); + 2); } private static void recipeBioChip() { diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ThaumcraftCraftingManager.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ThaumcraftCraftingManager.java index d502af0fc8..da472717b7 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ThaumcraftCraftingManager.java +++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ThaumcraftCraftingManager.java @@ -105,15 +105,30 @@ public class ClassTransformer_TC_ThaumcraftCraftingManager { String aDesc1 = "(L+aDeObfName+;ILjava/util/ArrayList;)Lthaumcraft/api/aspects/AspectList;"; String aDesc2 = "(L"+aObfName+";ILjava/util/ArrayList;)Lthaumcraft/api/aspects/AspectList;"; - if (name.equals("generateTags") && (desc.equals(aDesc1) || desc.equals(aDesc2))) { - Preloader_Logger.INFO("Found method descriptor: "+desc); + if (name.equals("generateTags") && signature != null) { if (desc.equals(aDesc1)) { + Preloader_Logger.LOG("TC CraftingManager Patch", Level.INFO, "Found generateTags to remove: "+desc+" | "+signature); + Preloader_Logger.LOG("TC CraftingManager Patch", Level.INFO, "Is not obfuscated."); obfuscated = false; - methodVisitor = null; + methodVisitor = null; } - else { + else if (desc.equals(aDesc2)) { + Preloader_Logger.LOG("TC CraftingManager Patch", Level.INFO, "Found generateTags to remove: "+desc+" | "+signature); + Preloader_Logger.LOG("TC CraftingManager Patch", Level.INFO, "Is obfuscated."); obfuscated = true; - methodVisitor = null; + methodVisitor = null; + } + else { + Preloader_Logger.INFO("Found generateTags: "+desc+" | "+signature); + if (desc.toLowerCase().contains("item")) { + obfuscated = false; + Preloader_Logger.LOG("TC CraftingManager Patch", Level.INFO, "Is not obfuscated."); + } + else { + obfuscated = true; + Preloader_Logger.LOG("TC CraftingManager Patch", Level.INFO, "Is obfuscated."); + } + methodVisitor = null; } } else { |