From cdadc03fa3e4f7d62738422a3565af3a9d578383 Mon Sep 17 00:00:00 2001 From: miozune Date: Thu, 18 May 2023 02:05:57 +0900 Subject: Use Avaritia variant of Tinkers' parts (#213) --- build.gradle | 6 +++--- dependencies.gradle | 23 +++++++++++----------- repositories.gradle | 1 - .../loader/recipe/ResearchStationAssemblyLine.java | 19 +++++++++--------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 3fa171e0dd..a8b7532dea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1683705740 +//version: 1684218858 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -69,7 +69,7 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.11' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14' } print("You might want to check out './gradlew :faq' if your build fails.\n") @@ -730,7 +730,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} diff --git a/dependencies.gradle b/dependencies.gradle index 9a1b62a01d..6e9a474de1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,28 +2,29 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.12:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.39:dev') api('com.github.GTNewHorizons:Yamcl:0.5.86:dev') - api('com.github.GTNewHorizons:ModularUI:1.1.2:dev') implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.29:dev') - compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive = false} - + compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive=false} + compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.9.32-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:OpenModularTurrets:2.2.11-247:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.4-GTNH:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:GTplusplus:1.9.3:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.5-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:GTplusplus:1.9.11:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Avaritia:1.41:dev') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') {transitive=false} compileOnly('curse.maven:computercraft-67504:2269339') {transitive=false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false} - compileOnly("curse.maven:extra-utilities-225561:2264384") {transitive = false} + compileOnly("curse.maven:extra-utilities-225561:2264384") {transitive=false} // for testing EOH recipes //runtimeOnlyNonPublishable("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.9.31-GTNH:dev') - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.18:dev') - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.6.2:dev') { + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.9.32-GTNH:dev') + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.21:dev') + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.6.4:dev') { // exclude group: "com.github.GTNewHorizons", module: "TecTech" //} - //runtimeOnlyNonPublishable("curse.maven:extra-utilities-225561:2264384") {transitive = false} + //runtimeOnlyNonPublishable("curse.maven:extra-utilities-225561:2264384") {transitive=false} + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:Avaritia:1.41:dev') {transitive=false} } diff --git a/repositories.gradle b/repositories.gradle index f73d9e18d8..40118b1677 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -2,7 +2,6 @@ repositories { ivy { - mavenLocal() url 'https://files.vexatos.com/' patternLayout { artifact "[module]/[artifact]-[revision](-[classifier])(.[ext])" diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index d3cd23d749..7d3943998e 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -23,7 +23,6 @@ import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.SGCraft; import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.enums.Mods.Thaumcraft; -import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.TinkersGregworks; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -36,6 +35,7 @@ import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; import com.rwtema.extrautils.ExtraUtils; +import fox.spiteful.avaritia.compat.ticon.Tonkers; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -43,6 +43,7 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import tconstruct.tools.TinkerTools; import vexatos.tgregworks.reference.PartTypes; import vexatos.tgregworks.util.TGregUtils; @@ -57,7 +58,10 @@ public class ResearchStationAssemblyLine implements Runnable { itemPartsUXVAsslineRecipes(); addWirelessEnergyRecipes(); - if (TinkersGregworks.isModLoaded() && GoodGenerator.isModLoaded() && ExtraUtilities.isModLoaded()) { + if (TinkersGregworks.isModLoaded() && GoodGenerator.isModLoaded() // Shirabon + && Avaritia.isModLoaded() // Infinity, Cosmic Neutronium + && ExtraUtilities.isModLoaded() // Bedrockium + ) { addEOHRecipes(); } @@ -2590,14 +2594,9 @@ public class ResearchStationAssemblyLine implements Runnable { ? FluidRegistry.getFluid("molten.mutatedlivingsolder") : FluidRegistry.getFluid("molten.solderingalloy"); ItemStack largeShirabonPlate = TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1); - ItemStack largeInfinityPlate = TGregUtils.newItemStack(Materials.Infinity, PartTypes.LargePlate, 1); - ItemStack largeBedrockiumPlate = getModItem( - TinkerConstruct.ID, - "heavyPlate", - 1, - ExtraUtils.tcon_bedrock_material_id); - ItemStack largeCosmicNeutroniumPlate = TGregUtils - .newItemStack(Materials.CosmicNeutronium, PartTypes.LargePlate, 1); + ItemStack largeInfinityPlate = new ItemStack(TinkerTools.largePlate, 1, Tonkers.infinityMetalId); + ItemStack largeBedrockiumPlate = new ItemStack(TinkerTools.largePlate, 1, ExtraUtils.tcon_bedrock_material_id); + ItemStack largeCosmicNeutroniumPlate = new ItemStack(TinkerTools.largePlate, 1, Tonkers.neutroniumId); final FluidStack[] specialFluid = new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440), -- cgit