diff options
| -rw-r--r-- | build.gradle | 96 | ||||
| -rw-r--r-- | dependencies.gradle | 22 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java | 27 |
3 files changed, 38 insertions, 107 deletions
diff --git a/build.gradle b/build.gradle index 055dcee435..f82d369676 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1680120787 +//version: 1681680742 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -67,20 +67,21 @@ plugins { id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version + id 'com.palantir.git-version' version '3.0.0' apply false id 'de.undercouch.download' version '5.3.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4' + id 'com.gtnewhorizons.retrofuturagradle' version '1.2.5' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") -if (project.file('.git/HEAD').isFile()) { +// In submodules, .git is a file pointing to the real git dir +if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -201,6 +202,14 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { @@ -1388,7 +1397,7 @@ static int replaceParams(File file, Map<String, String> params) { return 0 } -// Dependency Deobfuscation +// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle) def deobf(String sourceURL) { try { @@ -1430,11 +1439,7 @@ def deobfMaven(String repoURL, String mavenDep) { } def deobfCurse(String curseDep) { - try { - return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep") - } catch (Exception ignored) { - out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.") - } + return dependencies.rfg.deobf("curse.maven:$curseDep") } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. @@ -1442,34 +1447,7 @@ def deobf(String sourceURL, String rawFileName) { String bon2Version = "2.5.1" String fileName = URLDecoder.decode(rawFileName, "UTF-8") String cacheDir = "$project.gradle.gradleUserHomeDir/caches" - String bon2Dir = "$cacheDir/forge_gradle/deobf" - String bon2File = "$bon2Dir/BON2-${bon2Version}.jar" String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar" - String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar" - - if (file(deobfFile).exists()) { - return files(deobfFile) - } - - String mappingsVer - String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - if (remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } download.run { src sourceURL @@ -1477,50 +1455,8 @@ def deobf(String sourceURL, String rawFileName) { quiet true overwrite false } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } - - return files(deobfFile) + return dependencies.rfg.deobf(files(obfFile)) } - -def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if (zipFile.exists()) { - return - } - - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" - - download.run { - src "${url}fields.csv" - dest fieldsCache - quiet true - } - download.run { - src "${url}methods.csv" - dest methodsCache - quiet true - } - - zipFile.getParentFile().mkdirs() - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) - - zos.putNextEntry(new ZipEntry("fields.csv")) - Files.copy(Paths.get(fieldsCache), zos) - zos.closeEntry() - - zos.putNextEntry(new ZipEntry("methods.csv")) - Files.copy(Paths.get(methodsCache), zos) - zos.closeEntry() - - zos.close() -} - // Helper methods def checkPropertyExists(String propertyName) { diff --git a/dependencies.gradle b/dependencies.gradle index df823cce45..987fa4431d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,24 +1,24 @@ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.45:dev') - api("com.github.GTNewHorizons:bartworks:0.5.155:dev") - api("com.github.GTNewHorizons:TecTech:5.0.88:dev") + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.65-pre:dev') + api("com.github.GTNewHorizons:bartworks:0.6.12-pre:dev") + api("com.github.GTNewHorizons:TecTech:5.1.15-pre:dev") implementation('curse.maven:cofh-core-69162:2388751') // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels implementation('curse.maven:advsolar-362768:2885953') - compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.15:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:Railcraft:9.13.16:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.54:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:EnderCore:0.2.12:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.5:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Railcraft:9.14.1:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:EnderIO:2.4.10:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:EnderCore:0.2.13:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:SC2:2.0.2:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Binnie:2.0.48:dev') {transitive = false} compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false} - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.33:dev') {transitive=false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:Chisel:2.10.16-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Chisel:2.10.17-GTNH:dev') {transitive=false} compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {transitive = false} - runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev') + runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.6.5:dev') } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index 19f70dfb08..959b11c026 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -12,12 +12,7 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.MaterialsKevlar; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; +import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.items.CombType; @@ -319,7 +314,7 @@ public class RecipeLoader_ChemicalSkips { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadria.getDust(64), Materials.Trinium.getDust(64), Materials.Gold.getNanite(1) }, - Materials.SpaceTime.getMolten(9216L), + MaterialsUEVplus.SpaceTime.getMolten(9216L), ItemUtils.getSimpleStack(GenericChem.mAdvancedNaquadahCatalyst, 1), 60 * 20, (int) TierEU.RECIPE_UIV); @@ -327,14 +322,14 @@ public class RecipeLoader_ChemicalSkips { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), ItemList.Circuit_Chip_Stemcell.get(64), Materials.Gold.getNanite(1) }, - Materials.SpaceTime.getMolten(9216L), + MaterialsUEVplus.SpaceTime.getMolten(9216L), ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 1), 60 * 20, (int) TierEU.RECIPE_UIV); CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), MaterialsKevlar.Kevlar.getDust(64), - Materials.TranscendentMetal.getNanite(1) }, + MaterialsUEVplus.TranscendentMetal.getNanite(1) }, FluidUtils.getFluidStack("molten.shirabon", 92160), ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 1), 60 * 20, @@ -342,7 +337,7 @@ public class RecipeLoader_ChemicalSkips { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), - ItemList.Circuit_Chip_Biocell.get(64), Materials.TranscendentMetal.getNanite(1) }, + ItemList.Circuit_Chip_Biocell.get(64), MaterialsUEVplus.TranscendentMetal.getNanite(1) }, FluidUtils.getFluidStack("molten.shirabon", 92160), ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 1), 60 * 20, @@ -361,7 +356,7 @@ public class RecipeLoader_ChemicalSkips { GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), GregtechItemList.Laser_Lens_Special.get(1), getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 2) }, - new FluidStack[] { Materials.Thulium.getMolten(144 * 10), Materials.ExcitedDTCC.getFluid(5000), + new FluidStack[] { Materials.Thulium.getMolten(144 * 10), MaterialsUEVplus.ExcitedDTCC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) }, GregtechItemList.NeutronPulseManipulator.get(1), @@ -380,7 +375,7 @@ public class RecipeLoader_ChemicalSkips { GregtechItemList.Laser_Lens_Special.get(1), getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 4), ItemList.StableAdhesive.get(4) }, - new FluidStack[] { Materials.Thulium.getMolten(144 * 12), Materials.ExcitedDTPC.getFluid(5000), + new FluidStack[] { Materials.Thulium.getMolten(144 * 12), MaterialsUEVplus.ExcitedDTPC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) }, GregtechItemList.CosmicFabricManipulator.get(1), @@ -399,7 +394,7 @@ public class RecipeLoader_ChemicalSkips { GregtechItemList.Laser_Lens_Special.get(1), getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 8), ItemList.SuperconductorComposite.get(4) }, - new FluidStack[] { Materials.Thulium.getMolten(144 * 15), Materials.ExcitedDTRC.getFluid(5000), + new FluidStack[] { Materials.Thulium.getMolten(144 * 15), MaterialsUEVplus.ExcitedDTRC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10) }, GregtechItemList.InfinityInfusedManipulator.get(1), @@ -417,7 +412,7 @@ public class RecipeLoader_ChemicalSkips { GregtechItemList.Laser_Lens_Special.get(1), getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 16), ItemList.NaquadriaSupersolid.get(4) }, - new FluidStack[] { Materials.Thulium.getMolten(144 * 20), Materials.ExcitedDTEC.getFluid(5000), + new FluidStack[] { Materials.Thulium.getMolten(144 * 20), MaterialsUEVplus.ExcitedDTEC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10) }, GregtechItemList.SpaceTimeContinuumRipper.get(1), @@ -464,7 +459,7 @@ public class RecipeLoader_ChemicalSkips { (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ALLOY.QUANTUM.getFrameBox(4), ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 16), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 16), ItemList.Field_Generator_UIV.get(1), GT_OreDictUnificator.get("screwMetastableOganesson", 16), ItemList.SuperconductorComposite.get(4) }, new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), }, @@ -479,7 +474,7 @@ public class RecipeLoader_ChemicalSkips { (int) TierEU.RECIPE_UEV, 32, new ItemStack[] { ALLOY.QUANTUM.getFrameBox(8), GT_OreDictUnificator.get("plateDenseShirabon", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 16), ItemList.Field_Generator_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), ItemList.NaquadriaSupersolid.get(4) }, |