update the buildscript and fix the deps

This commit is contained in:
FalsePattern committed 2022-07-02 18:40:49 +02:00
1 parent 53a9fa8cf7
commit a44be1dc1e
2 files changed
+31 -25

No files matched your search

+24 -19
View File
@@ -1,4 +1,4 @@
//version: 1656003793falsepattern26
//version: 1656003793falsepattern29
/*
DO NOT CHANGE THIS FILE!
@@ -616,14 +616,16 @@ def getMavenSettingsCredentials = {
def getCredentials = {
String username = System.getenv("MAVEN_DEPLOY_USER")
String password = System.getenv("MAVEN_DEPLOY_PASSWORD")
if (username == null || password == null) {
def entries = getMavenSettingsCredentials()
for (entry in entries) {
if (entry."id".text() == repositoryName) {
return [username: entry.username.text(), password: entry.password.text()]
if (username == null) {
try {
def entries = getMavenSettingsCredentials()
for (entry in entries) {
if (entry."id".text() == repositoryName) {
return [username: entry.username.text(), password: entry.password.text()]
}
}
}
return [username: null, password: null]
} catch (Exception ignored){}
return [username: "none", password: "none"]
} else {
return [username: username, password: password]
}
@@ -675,8 +677,8 @@ publishing {
url = repositoryURL
def creds = getCredentials()
credentials {
username = creds == null ? "none" : creds.username
password = creds == null ? "none" : creds.password
username = creds?.username ?: "none"
password = creds?.password ?: "none"
}
}
}
@@ -708,7 +710,7 @@ boolean performBuildScriptUpdate(String projectDir) {
if (isNewBuildScriptVersionAvailable(projectDir)) {
def buildscriptFile = getFile("build.gradle")
availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
out.println("Build script updated. Please REIMPORT the project or RESTART your IDE!")
return true
}
return false
@@ -838,16 +840,19 @@ configure(deobfParams) {
// Dependency Deobfuscation
def deobfMaven(mavenDep) {
throw new GradleException("deobfMaven(mavenDep) is deprecated. " +
"You must use the new deobfMaven(repoURL, mavenDep) method instead." +
"The old method broke the buildscript when used.")
}
def deobfMaven(String repoURL, String mavenDep) {
if (!repoURL.endsWith("/")) {
repoURL += "/"
}
String[] parts = mavenDep.split(":")
parts[0] = parts[0].replace('.', '/')
for (ArtifactRepository repository: project.repositories.asList()) {
def url = repository.properties.get("url").toString()
def jarURL = url + parts[0] + "/" + parts[1] + "/" + parts[2] + "/" + parts[1] + "-" + parts[2] + ".jar"
try {
return deobf(jarURL)
} catch (Exception ignored){}
}
throw new GradleException("Could not find dependency " + mavenDep + " on any repository!")
def jarURL = repoURL + parts[0] + "/" + parts[1] + "/" + parts[2] + "/" + parts[1] + "-" + parts[2] + ".jar"
return deobf(jarURL)
}
def deobf(String sourceURL) {
+7 -6
View File
@@ -6,12 +6,13 @@ dependencies {
compile("com.falsepattern:falsepatternlib-mc1.7.10:0.8.2:dev")
compileOnly(deobfMaven("curse.maven:undergroundbiomesconstructs-72744:2304497")) // 0.8-beta49
compileOnly(deobfMaven("curse.maven:more-fun-quicksand-mod-321960:2717318")) // 1.0.8.8-fixed
compileOnly(deobfMaven("curse.maven:worldedit-225608:2309699")) // 6.1.1
compileOnly(deobfMaven("curse.maven:cofh-lib-220333:2388747")) // 1.2.1-185
compileOnly(deobfMaven("curse.maven:dragonapi-235591:3574508")) // V31b
String curseMaven = "https://cursemaven.falsepattern.com/" //Use https://cursemaven.com/ if this is down
compileOnly(deobfMaven(curseMaven, "curse.maven:undergroundbiomesconstructs-72744:2304497")) // 0.8-beta49
compileOnly(deobfMaven(curseMaven, "curse.maven:more-fun-quicksand-mod-321960:2717318")) // 1.0.8.8-fixed
compileOnly(deobfMaven(curseMaven, "curse.maven:worldedit-225608:2309699")) // 6.1.1
compileOnly("curse.maven:cofh-lib-220333:2388748") // 1.2.1-185-dev
compileOnly(deobfMaven(curseMaven, "curse.maven:dragonapi-235591:3574508")) // V31b
compileOnly(deobfMaven("curse.maven:antiidconflict-246288:2308279")) // 1.3.5
compileOnly(deobfMaven(curseMaven, "curse.maven:antiidconflict-246288:2308279")) // 1.3.5
compileOnly(files("lib/GalacticraftCore-1.7-3.0.12.504-deobf.jar"))
}