From 92ba4e62b6628a146dd24df13ae9ec40b0a69a22 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 29 Nov 2021 16:38:31 +0000 Subject: Added new generic Nuclear Chem item. Added ability to set Fluid for a Material. Moved Nuclear recipe generation to a different phase during init. --- src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 4fda17ee8a..c345863a61 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -43,6 +43,7 @@ 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_Nuclear; import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; @@ -228,7 +229,8 @@ public class COMPAT_HANDLER { public static void startLoadingGregAPIBasedRecipes(){ //Add hand-made recipes - RECIPES_GREGTECH.run(); + RECIPES_GREGTECH.run(); + RecipeLoader_Nuclear.generate(); //Add autogenerated Recipes from Item Components for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo r : m) { -- cgit From b3aba53222d66327557cf06a4aea202b72851f03 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Fri, 10 Dec 2021 18:11:45 +0000 Subject: Migrate some recipe from GTNH CoreMod. --- src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Java/gtPlusPlus/core/handler') diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index c345863a61..53d63499a6 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -43,6 +43,7 @@ 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; @@ -230,6 +231,7 @@ public class COMPAT_HANDLER { public static void startLoadingGregAPIBasedRecipes(){ //Add hand-made recipes RECIPES_GREGTECH.run(); + RecipeLoader_GTNH.generate(); RecipeLoader_Nuclear.generate(); //Add autogenerated Recipes from Item Components for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { -- cgit From 2a6d7ff6b93b309e9857057d5d0d1c612da9d1e8 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 11 Dec 2021 11:10:21 +0000 Subject: Fixed ChemPlant book. --- src/Java/gtPlusPlus/core/handler/BookHandler.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/Java/gtPlusPlus/core/handler') 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" + -- cgit From 17f817dd419952fc089c5fc9564a9a2eb93de1f7 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 11 Dec 2021 11:23:35 +0000 Subject: Adjusted LFTR a bit. --- src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/handler') 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); } -- cgit