oier/patatapack2-distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update FG3 resolver for latest 1.16.1 changes.

Browse Source
This commit is contained in:
Daniel Scalzi
2020-06-29 10:17:05 -04:00
parent 0a9c82434b
commit c470c22f14
1 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/resolver/forge/adapter/ForgeGradle3.resolver.ts
View File

@@ -51,6 +51,10 @@ export class ForgeGradle3Adapter extends ForgeResolver {
private configure(): void { private configure(): void {
// Configure for 13, 14, 15, 16 // Configure for 13, 14, 15, 16
if(VersionUtil.isVersionAcceptable(this.minecraftVersion, [13, 14, 15, 16])) { if(VersionUtil.isVersionAcceptable(this.minecraftVersion, [13, 14, 15, 16])) {
// https://github.com/MinecraftForge/MinecraftForge/commit/97d4652f5fe15931b980117efabdff332f9f6428
const mcpUnifiedVersion = `${this.minecraftVersion}-${ForgeGradle3Adapter.WILDCARD_MCP_VERSION}`
this.generatedFiles = [ this.generatedFiles = [
{ {
name: 'base jar', name: 'base jar',
@@ -73,6 +77,29 @@ export class ForgeGradle3Adapter extends ForgeResolver {
version: this.artifactVersion, version: this.artifactVersion,
classifiers: ['client'] classifiers: ['client']
}, },
{
name: 'client data',
group: LibRepoStructure.MINECRAFT_GROUP,
artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
version: this.minecraftVersion.toString(),
classifiers: ['data'],
skipIfNotPresent: true
},
{
name: 'client srg',
group: LibRepoStructure.MINECRAFT_GROUP,
artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
version: mcpUnifiedVersion,
classifiers: ['srg']
}
]
this.wildcardsInUse = [
ForgeGradle3Adapter.WILDCARD_MCP_VERSION
]
if(VersionUtil.isVersionAcceptable(this.minecraftVersion, [13, 14, 15])) {
this.generatedFiles.push(
{ {
name: 'client slim', name: 'client slim',
group: LibRepoStructure.MINECRAFT_GROUP, group: LibRepoStructure.MINECRAFT_GROUP,
@@ -83,14 +110,6 @@ export class ForgeGradle3Adapter extends ForgeResolver {
'slim-stable' 'slim-stable'
] ]
}, },
{
name: 'client data',
group: LibRepoStructure.MINECRAFT_GROUP,
artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
version: this.minecraftVersion.toString(),
classifiers: ['data'],
skipIfNotPresent: true
},
{ {
name: 'client extra', name: 'client extra',
group: LibRepoStructure.MINECRAFT_GROUP, group: LibRepoStructure.MINECRAFT_GROUP,
@@ -100,18 +119,36 @@ export class ForgeGradle3Adapter extends ForgeResolver {
'extra', 'extra',
'extra-stable' 'extra-stable'
] ]
}, }
)
} else {
this.generatedFiles.push(
{ {
name: 'client srg', name: 'client slim',
group: LibRepoStructure.MINECRAFT_GROUP, group: LibRepoStructure.MINECRAFT_GROUP,
artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT, artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
version: `${this.minecraftVersion}-${ForgeGradle3Adapter.WILDCARD_MCP_VERSION}`, version: mcpUnifiedVersion,
classifiers: ['srg'] classifiers: [
'slim',
'slim-stable'
]
},
{
name: 'client extra',
group: LibRepoStructure.MINECRAFT_GROUP,
artifact: LibRepoStructure.MINECRAFT_CLIENT_ARTIFACT,
version: mcpUnifiedVersion,
classifiers: [
'extra',
'extra-stable'
]
} }
] )
this.wildcardsInUse = [
ForgeGradle3Adapter.WILDCARD_MCP_VERSION }
]
return return
} }