From 4f43009e9302225df351469a2317572b48d7c54a Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 20 Aug 2022 18:56:23 +0200 Subject: [PATCH] Fusion crafter addons recipes (#43) * add a new Nei Texture and change Input slots to 9 * change Fusion Crafter Recipes * spotless * update gt dep * fix derp * add Fusion crafter gui to emt (cherry picked from commit 2fd716ca3a2ab5141304611f7cc00551d2ecc435) * update gt dep (cherry picked from commit 1487b7c91815c5809c53a4c21f8f7e91f12a4b2b) * Update dependencies.gradle * change DE recipes a bit * spotlessApply (#44) Co-authored-by: Martin Robertz Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- dependencies.gradle | 2 +- .../common/loader/EMT_RecipeAdder.java | 90 +++++++++++------- .../gui/basicmachines/FusionCrafter.png | Bin 0 -> 5094 bytes 3 files changed, 59 insertions(+), 33 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionCrafter.png diff --git a/dependencies.gradle b/dependencies.gradle index a6d529a..8082522 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.01:dev' + compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.05:dev' compile 'com.github.GTNewHorizons:Baubles:1.0.1.14:dev' compile 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev' diff --git a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java b/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java index 7680e3b..b9a803e 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_RecipeAdder.java @@ -5,6 +5,8 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI; import cpw.mods.fml.common.Loader; import emt.init.EMTItems; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; @@ -22,8 +24,8 @@ public class EMT_RecipeAdder { "emt.recipe.fusioncrafting", "Draconic Evolution Fusion Crafter", null, - RES_PATH_GUI + "basicmachines/Default", - 6, + RES_PATH_GUI + "basicmachines/FusionCrafter", + 9, 1, 1, 0, @@ -86,55 +88,79 @@ public class EMT_RecipeAdder { // CORES - addFusionCraftingRecipe( + addFusionCraftingRecipeNonOptimized( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1), + ItemList.QuantumEye.get(1L), new ItemStack(EMTItems.itemEMTItems, 0, 16) }, + Materials.Sunnarium.getMolten(1440), GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), + GT_Values.NF, 400, - 30720, + 500000, 1); - addFusionCraftingRecipe( + addFusionCraftingRecipeNonOptimized( new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 6), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4), GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), - new ItemStack(EMTItems.itemEMTItems, 0, 17) + ItemList.QuantumStar.get(1L), + new ItemStack(EMTItems.itemEMTItems, 0, 17), }, + Materials.Neutronium.getMolten(1440), GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0), + GT_Values.NF, 800, - 65536, + 2000000, 2); + if (Loader.isModLoaded("supersolarpanel")) { + addFusionCraftingRecipeNonOptimized( + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), + GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), + GT_ModHandler.getModItem("supersolarpanel", "enderquantumcomponent", 1, 0), + new ItemStack(EMTItems.itemEMTItems, 0, 18) + }, + Materials.Infinity.getMolten(1440), + GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), + GT_Values.NF, + 1600, + 8000000, + 3); + } else { + addFusionCraftingRecipeNonOptimized( + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), + GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), + GT_ModHandler.getModItem("dreamcraft", "item.ManyullynCrystal", 1, 0), + new ItemStack(EMTItems.itemEMTItems, 0, 18) + }, + Materials.Infinity.getMolten(1440), + GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), + GT_Values.NF, + 1600, + 8000000, + 3); + } - addFusionCraftingRecipe( + addFusionCraftingRecipeNonOptimized( new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), - GT_ModHandler.getModItem("dreamcraft", "ManyullynCrystal", 1, 0), - new ItemStack(EMTItems.itemEMTItems, 0, 18) - }, - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), - 1600, - 122880, - 3); - - addFusionCraftingRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 6), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 4, 0), - GT_ModHandler.getModItem("DraconicEvolution", "chaosShard", 1, 0), + GT_ModHandler.getModItem("DraconicEvolution", "chaosFragment", 2, 2), new ItemStack(EMTItems.itemEMTItems, 0, 19) }, + Materials.SpaceTime.getMolten(1440), GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 1, 0), + GT_Values.NF, 3200, - 500000, + 24000000, 4); // ENERGY CORES @@ -142,14 +168,14 @@ public class EMT_RecipeAdder { addFusionCraftingRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedstoneAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4), GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 1), GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), new ItemStack(EMTItems.itemEMTItems, 0, 17) }, GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 0), 1000, - 65536, + 500000, 2); addFusionCraftingRecipe( @@ -162,7 +188,7 @@ public class EMT_RecipeAdder { }, GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 1), 2000, - 122880, + 2000000, 3); // Dragon Blood diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionCrafter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionCrafter.png new file mode 100644 index 0000000000000000000000000000000000000000..de5986d0f95efc31d4e5910bc2a2f528c8cbb713 GIT binary patch literal 5094 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 D5OW?N literal 0 HcmV?d00001