diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/handler')
3 files changed, 16 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/Java/gtPlusPlus/core/handler/BookHandler.java index 4bfd39e9a3..d85de925bf 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BookHandler.java @@ -288,49 +288,49 @@ public class BookHandler { "XXXXXXX", "Layer 2:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AMMMMMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMMMMMA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 3:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 4:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AACCCAA" + "\n" + "AACCCAA" + "\n" + "AACCCAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 5:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 6:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AMMMMMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMMMMMA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 7:" + "\n" + "\n" + "XXXXXXX" + "\n" + diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 4fda17ee8a..53d63499a6 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -43,6 +43,8 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; @@ -228,7 +230,9 @@ public class COMPAT_HANDLER { public static void startLoadingGregAPIBasedRecipes(){ //Add hand-made recipes - RECIPES_GREGTECH.run(); + RECIPES_GREGTECH.run(); + RecipeLoader_GTNH.generate(); + RecipeLoader_Nuclear.generate(); //Add autogenerated Recipes from Item Components for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo<Material> r : m) { diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java index b3b720497e..8499f98525 100644 --- a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java +++ b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java @@ -38,7 +38,7 @@ public class StopAnnoyingFuckingAchievements { Field aGameSettings = ReflectionUtils.getField(aClazz2, "gameSettings"); Object aGameSettingsObj = ReflectionUtils.getFieldValue(aInstanceMC, aGameSettings); Class aClazz3 = aGameSettingsObj.getClass(); - if (aClazz2 != null) { + if (aClazz3 != null) { Field ainvHint = ReflectionUtils.getField(aClazz3, "showInventoryAchievementHint"); ReflectionUtils.setField(aGameSettingsObj, ainvHint, false); } |