From df5ea8d7b3c8f29723e89a9c348aab9045ba2735 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 16 Jan 2025 21:53:11 +0100 Subject: [PATCH 1/3] change scanning time to new GT format --- .../common/recipes/ManipulatorRecipes.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java index b7852a1..5e753cc 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java @@ -7,6 +7,7 @@ import static gregtech.api.util.GTRecipeBuilder.*; import static gregtech.api.util.GTRecipeConstants.*; +import gregtech.api.util.recipe.Scanning; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -269,7 +270,7 @@ private static void addMK2Recipes() { // Power core MK2 GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_HPIC.get(2)) - .metadata(RESEARCH_TIME, 40 * MINUTES) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.HSSS, 8), ItemList.Energy_LapotronicOrb2.get(1), @@ -292,7 +293,7 @@ private static void addMK2Recipes() { // Computer core MK2 GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1)) - .metadata(RESEARCH_TIME, 40 * MINUTES) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), new Object[] { @@ -314,7 +315,7 @@ private static void addMK2Recipes() { // Teleporter core MK2 if (gs) GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Quantium, 1)) - .metadata(RESEARCH_TIME, 40 * MINUTES) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Quantium, 1), ItemList.Emitter_LuV.get(2), @@ -349,7 +350,7 @@ private static void addMK2Recipes() { // Lens MK2 GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, WerkstoffLoader.RedZircon.get(OrePrefixes.lens, 1)) - .metadata(RESEARCH_TIME, 40 * MINUTES) + .metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( WerkstoffLoader.RedZircon.get(OrePrefixes.lens, 2), GTOreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4), @@ -390,7 +391,7 @@ private static void addMK3Recipe() { // Power core MK3 GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_UHPIC.get(2)) - .metadata(RESEARCH_TIME, 60 * MINUTES) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.NaquadahAlloy, 8), ItemList.Energy_Module.get(1), @@ -410,7 +411,7 @@ private static void addMK3Recipe() { // Computer core MK3 GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1)) - .metadata(RESEARCH_TIME, 60 * MINUTES) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), new Object[] { @@ -429,7 +430,7 @@ private static void addMK3Recipe() { // Teleporter core MK3 if (gs) GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.MysteriousCrystal, 1)) - .metadata(RESEARCH_TIME, 60 * MINUTES) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.MysteriousCrystal, 1), ItemList.Emitter_ZPM.get(2), @@ -465,7 +466,7 @@ private static void addMK3Recipe() { // Lens MK3 GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.lens, 1)) - .metadata(RESEARCH_TIME, 60 * MINUTES) + .metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM)) .itemInputs( WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.lens, 2), GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), @@ -525,7 +526,7 @@ private static void addMK3Recipe() { .maybeStack(1) .get() ) - .metadata(RESEARCH_TIME, 120 * MINUTES) + .metadata(SCANNING, new Scanning(4 * MINUTES, TierEU.RECIPE_LuV)) .itemInputs( AEApi.instance() .definitions() From 14042d76e493d53ac2b9d6e3c82a258de7fd04c7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 16 Jan 2025 22:10:01 +0100 Subject: [PATCH 2/3] sa --- .../matter_manipulator/common/recipes/ManipulatorRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java index 5e753cc..9a0bd6b 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java @@ -7,7 +7,6 @@ import static gregtech.api.util.GTRecipeBuilder.*; import static gregtech.api.util.GTRecipeConstants.*; -import gregtech.api.util.recipe.Scanning; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -22,6 +21,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; +import gregtech.api.util.recipe.Scanning; import appeng.api.AEApi; From 6e81de0c1ca26cb98af8b614f6968054fe7f0957 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 16 Jan 2025 22:10:11 +0100 Subject: [PATCH 3/3] deps --- dependencies.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index d80852a..7981937 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -41,26 +41,26 @@ dependencies { implementation("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") implementation("com.github.GTNewHorizons:ModularUI:1.2.17:dev") - compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta28:api') { transitive = false } - compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-521-GTNH:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta29:api') { transitive = false } + compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-523-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ArchitectureCraft:1.10.2") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false } compileOnly("curse.maven:cofh-lib-220333:2388748") { transitive = false } compileOnly("com.github.GTNewHorizons:EnderIO:2.9.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.15:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.16:dev") { transitive = false } compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { transitive = false } compileOnly("curse.maven:mekanism-268560:2475797") { transitive = false } - compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.20-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.22-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:waila:1.8.2:dev") { transitive = false } - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-521-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-523-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:ArchitectureCraft:1.10.2") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.20-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.6.15:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.22-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.6.16:dev") runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev") compileOnly deobf("https://www.immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar", "immibis-microblocks-59.1.2")