From 680fef1a0f49d8706fd58093da63a2d9438d0641 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Tue, 7 Dec 2021 17:54:21 +0000 Subject: More minor fixes. --- .../gtPlusPlus/core/material/MaterialGenerator.java | 19 +++++++++++-------- .../gtPlusPlus/core/util/reflect/ReflectionUtils.java | 12 ++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java index 85562c78b1..a8dcb37f02 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java @@ -277,7 +277,7 @@ public class MaterialGenerator { } public static void generateNuclearDusts(final Material matInfo, boolean generateDehydratorRecipe){ - generateNuclearMaterial(matInfo, false, true, false, false); + generateNuclearMaterial(matInfo, false, true, false, false, false); if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) { CORE.RA.addDehydratorRecipe( new ItemStack[] { @@ -298,11 +298,11 @@ public class MaterialGenerator { } public static void generateNuclearMaterial(final Material matInfo, final boolean generatePlates){ - generateNuclearMaterial(matInfo, true, true, true, generatePlates); + generateNuclearMaterial(matInfo, true, true, true, generatePlates, true); } public static void generateNuclearMaterial(final Material matInfo, final boolean generateBlock, - final boolean generateDusts, final boolean generateIngot, final boolean generatePlates){ + final boolean generateDusts, final boolean generateIngot, final boolean generatePlates, final boolean generateMiscRecipes){ try { if (generateBlock) { @@ -324,11 +324,14 @@ public class MaterialGenerator { new RecipeGen_Assembler(matInfo); } - new RecipeGen_ShapedCrafting(matInfo); - new RecipeGen_Fluids(matInfo); - new RecipeGen_MaterialProcessing(matInfo); - new RecipeGen_DustGeneration(matInfo, true); - new RecipeGen_Recycling(matInfo); + if (generateMiscRecipes) { + new RecipeGen_ShapedCrafting(matInfo); + new RecipeGen_Fluids(matInfo); + new RecipeGen_MaterialProcessing(matInfo); + new RecipeGen_Recycling(matInfo); + } + + new RecipeGen_DustGeneration(matInfo, generateMiscRecipes); new RecipeGen_Plasma(matInfo); } catch (final Throwable t){ diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index e0634dfb14..1ef925f793 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -432,6 +432,18 @@ public class ReflectionUtils { t.printStackTrace(); } } + + /** + * Allows to change the state of an immutable instance. Huh?!? + */ + public static void setFinalFieldValue(Class clazz, Field field, Object newValue) { + try { + setFieldValue_Internal(clazz, field, newValue); + } + catch (Throwable t) { + t.printStackTrace(); + } + } @Deprecated public static void setFinalStatic(Field field, Object newValue) throws Exception { -- cgit