aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-07 17:54:21 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-07 17:54:21 +0000
commit680fef1a0f49d8706fd58093da63a2d9438d0641 (patch)
tree22f1da8e3cb9177e399ef68842c1e6ca7f1298e9 /src/Java/gtPlusPlus/core
parenta4779df4755d9312936529aca3de1297fed7a904 (diff)
downloadGT5-Unofficial-680fef1a0f49d8706fd58093da63a2d9438d0641.tar.gz
GT5-Unofficial-680fef1a0f49d8706fd58093da63a2d9438d0641.tar.bz2
GT5-Unofficial-680fef1a0f49d8706fd58093da63a2d9438d0641.zip
More minor fixes.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialGenerator.java19
-rw-r--r--src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java12
2 files changed, 23 insertions, 8 deletions
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 {