diff options
| -rw-r--r-- | build.gradle | 96 | ||||
| -rw-r--r-- | dependencies.gradle | 22 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java | 21 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/loader/FuelRecipeLoader.java | 5 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/loader/RecipeLoader.java | 2 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/loader/RecipeLoader_02.java | 30 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/StackUtils.java | 3 |
7 files changed, 58 insertions, 121 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 8b2b29f1bf..c494e1bd3d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,22 +2,22 @@ dependencies { - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.55:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.67-pre:dev') compile('com.github.GTNewHorizons:StructureLib:1.2.6:dev') compile("com.github.GTNewHorizons:ModularUI:1.1.2:dev") - compile('com.github.GTNewHorizons:bartworks:0.6.9:dev') - compile('com.github.GTNewHorizons:NotEnoughItems:2.3.43-GTNH:dev') - compile('com.github.GTNewHorizons:TecTech:5.1.7:dev') + compile('com.github.GTNewHorizons:bartworks:0.6.12-pre:dev') + compile('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev') + compile('com.github.GTNewHorizons:TecTech:5.1.15-pre:dev') compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compileOnly('com.github.GTNewHorizons:EnderCore:0.2.13:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-192-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GTplusplus:1.8.35:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:AppleCore:3.2.3:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-195-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GTplusplus:1.8.38-pre:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:AppleCore:3.2.10:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Railcraft:9.14.0: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:ExtraCells2:2.5.33:dev') {transitive = false} @@ -25,9 +25,9 @@ dependencies { compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.1-GTNH:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {transitive = false} - runtimeOnly('com.github.GTNewHorizons:NewHorizonsCoreMod:2.0.17:dev') + runtimeOnly('com.github.GTNewHorizons:NewHorizonsCoreMod:2.0.30-pre:dev') runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.6.5:dev') - runtimeOnly('com.github.GTNewHorizons:GTplusplus:1.8.35:dev') + runtimeOnly('com.github.GTNewHorizons:GTplusplus:1.8.38-pre:dev') - //compileOnly('com.github.GTNewHorizons:Avaritia:1.35) + //compileOnly('com.github.GTNewHorizons:Avaritia:1.37) } diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index a3a607903d..8ba32f6205 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -19,10 +19,7 @@ import com.github.technus.tectech.recipe.TT_recipeAdder; import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.util.StackUtils; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.recipe.common.CI; @@ -262,13 +259,13 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 8000000, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), ComponentType.Robot_Arm.getComponent(t).get(8), ComponentType.Electric_Piston.getComponent(t).get(10), ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), @@ -284,13 +281,13 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 32000000, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), ComponentType.Robot_Arm.getComponent(t).get(8), ComponentType.Electric_Piston.getComponent(t).get(10), ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index bd102bc310..648cb69455 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -13,6 +13,7 @@ import goodgenerator.items.MyMaterial; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; @@ -112,8 +113,8 @@ public class FuelRecipeLoader { MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), FluidRegistry.getFluidStack("heavyradox", 1000), }, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TranscendentMetal, 16), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16), MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48), }, MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750), 300000000, diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 3998f53e45..cf4904f5c4 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -638,7 +638,7 @@ public class RecipeLoader { ItemList.Field_Generator_UEV.get(2), ItemList.Electric_Pump_UEV.get(8), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), ItemList.Circuit_Wafer_PPIC.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, }, diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 52b3faaec5..f0d20aefd8 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -374,7 +374,8 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) }, new FluidStack[] { Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 30240), - Materials.TranscendentMetal.getMolten(1440), Materials.InfinityCatalyst.getMolten(5670) }, + MaterialsUEVplus.TranscendentMetal.getMolten(1440), + Materials.InfinityCatalyst.getMolten(5670) }, ItemRefer.Fluid_Storage_Core_T9.get(1), 400, 134217000); @@ -388,12 +389,13 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1) }, + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1) }, new FluidStack[] { Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 46080), - Materials.TranscendentMetal.getMolten(4320), Materials.InfinityCatalyst.getMolten(17010) }, + MaterialsUEVplus.TranscendentMetal.getMolten(4320), + Materials.InfinityCatalyst.getMolten(17010) }, ItemRefer.Fluid_Storage_Core_T10.get(1), 400, 536800000); @@ -551,7 +553,7 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T9.get(1), 240000, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 2), + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 2), ItemRefer.Fluid_Storage_Core_T10.get(2), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 6L }, new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 6L }, @@ -559,11 +561,11 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5) }, + GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 5), + GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 5) }, new FluidStack[] { Materials.DraconiumAwakened.getMolten(14400), - Materials.TranscendentMetal.getMolten(1440), FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080) }, + MaterialsUEVplus.TranscendentMetal.getMolten(1440), + FluidRegistry.getFluidStack("supercoolant", 46080), Materials.Lubricant.getFluid(46080) }, ItemRefer.YOTTank_Cell_T10.get(1), 1000, 536800000); @@ -660,7 +662,7 @@ public class RecipeLoader_02 { GT_Values.RA.addUnboxingRecipe( ItemRefer.YOTTank_Cell_T10.get(1), ItemRefer.Fluid_Storage_Core_T10.get(2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), 100, 480); @@ -1590,8 +1592,8 @@ public class RecipeLoader_02 { GT_Values.RA.addPlasmaForgeRecipe( new ItemStack[] { ItemRefer.HiC_T5.get(0) }, new FluidStack[] { MyMaterial.metastableOganesson.getMolten(1152), - MyMaterial.preciousMetalAlloy.getMolten(2304), Materials.SpaceTime.getMolten(288), - Materials.DimensionallyTranscendentResidue.getFluid(5000) }, + MyMaterial.preciousMetalAlloy.getMolten(2304), MaterialsUEVplus.SpaceTime.getMolten(288), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(5000) }, new ItemStack[] {}, new FluidStack[] { MyMaterial.shirabon.getMolten(144) }, 200, diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java index 3de85910cb..0d0c2a94ee 100644 --- a/src/main/java/goodgenerator/util/StackUtils.java +++ b/src/main/java/goodgenerator/util/StackUtils.java @@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack; import goodgenerator.items.MyMaterial; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.util.GT_Utility; public class StackUtils { @@ -116,7 +117,7 @@ public class StackUtils { case 11: // UIV return MyMaterial.metastableOganesson.getMolten(aAmount); case 12: // UMV - return Materials.SpaceTime.getMolten(aAmount); + return MaterialsUEVplus.SpaceTime.getMolten(aAmount); default: return MyMaterial.shirabon.getMolten(aAmount); } |