Skip to content

Commit

Permalink
add maven groups to dep constants
Browse files Browse the repository at this point in the history
  • Loading branch information
@SpaceWalkerRS
SpaceWalkerRS committed Mar 30, 2024
1 parent 1962889 commit 5f3f8fd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
10 changes: 5 additions & 5 deletions src/main/java/net/ornithemc/ploceus/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public class Constants {
public static final String VERSION_MANIFEST_URL = "https://skyrising.github.io/mc-versions/version_manifest.json";

public static final String CALAMUS_INTERMEDIARY_MAVEN_GROUP = "net.ornithemc";
public static final String CALAMUS_GEN1_MAPPINGS = "calamus-intermediary:%s";
public static final String CALAMUS_GEN1_MAPPINGS = CALAMUS_INTERMEDIARY_MAVEN_GROUP + ":calamus-intermediary:%s";
public static String calamusGen1Url(GameSide side) {
return MAVEN_URL + "/net/ornithemc/calamus-intermediary/%1$s" + side.suffix() + "/calamus-intermediary-%1$s" + side.suffix() + "-v2.jar";
}
public static final String CALAMUS_GEN2_MAPPINGS = "calamus-intermediary-gen%d:%s";
public static final String CALAMUS_GEN2_MAPPINGS = CALAMUS_INTERMEDIARY_MAVEN_GROUP + ":calamus-intermediary-gen%d:%s";
public static String calamusGen2Url(int generation) {
return MAVEN_URL + "/net/ornithemc/calamus-intermediary-gen" + generation + "/%1$s/calamus-intermediary-gen" + generation + "-%1$s-v2.jar";
}
Expand All @@ -55,10 +55,10 @@ public static String featherGen2Mappings(int generation, String mc, int build) {
public static final String OSL_MODULE_META_ENDPOINT = "/v3/versions/osl/%s/%s/%s";

public static final String MCP_MAVEN_GROUP = "de.oceanlabs.mcp";
public static final String SRG_MAPPINGS = "mcp:%s:srg@zip";
public static final String MCP_MAPPINGS = "mcp_%s:%s-%s@zip";
public static final String SRG_MAPPINGS = MCP_MAVEN_GROUP + ":mcp:%s:srg@zip";
public static final String MCP_MAPPINGS = MCP_MAVEN_GROUP + ":mcp_%s:%s-%s@zip";

public static final String FORGE_MAVEN_GROUP = "net.minecraftforge.mcp";
public static final String FORGE_SRC = "forge:%s-%s:src@zip";
public static final String FORGE_SRC = FORGE_MAVEN_GROUP + ":forge:%s-%s:src@zip";

}
22 changes: 12 additions & 10 deletions src/main/java/net/ornithemc/ploceus/PloceusGradleExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,11 @@ public SigsProvider getSigsProvider() {

@Override
public Dependency featherMappings(int build) {
return project.getDependencies().create(generation.get() == 1
? Constants.featherGen1Mappings(minecraftVersion(), side.get(), build)
: Constants.featherGen2Mappings(generation.get(), minecraftVersion(), build));
return project.getDependencies().create(
getGeneration().get() == 1
? Constants.featherGen1Mappings(minecraftVersion(), side.get(), build)
: Constants.featherGen2Mappings(getGeneration().get(), minecraftVersion(), build)
);
}

@Override
Expand All @@ -155,10 +157,10 @@ public McpModernMappingsSpec mcpMappings(String channel, String build) {
public McpModernMappingsSpec mcpMappings(String channel, String mc, String build) {
return new McpModernMappingsSpec(
getGeneration().get() == 1
? FileSpec.create(String.format(Constants.CALAMUS_INTERMEDIARY_MAVEN_GROUP + ":" + Constants.CALAMUS_GEN1_MAPPINGS, mc))
: FileSpec.create(String.format(Constants.CALAMUS_INTERMEDIARY_MAVEN_GROUP + ":" + Constants.CALAMUS_GEN2_MAPPINGS, getGeneration().get(), mc)),
FileSpec.create(String.format(Constants.MCP_MAVEN_GROUP + ":" + Constants.SRG_MAPPINGS, mc)),
FileSpec.create(String.format(Constants.MCP_MAVEN_GROUP + ":" + Constants.MCP_MAPPINGS, channel, build, mc))
? FileSpec.create(String.format(Constants.CALAMUS_GEN1_MAPPINGS, mc))
: FileSpec.create(String.format(Constants.CALAMUS_GEN2_MAPPINGS, getGeneration().get(), mc)),
FileSpec.create(String.format(Constants.SRG_MAPPINGS, mc)),
FileSpec.create(String.format(Constants.MCP_MAPPINGS, channel, build, mc))
);
}

Expand All @@ -171,9 +173,9 @@ public McpForgeMappingsSpec mcpForgeMappings(String version) {
public McpForgeMappingsSpec mcpForgeMappings(String mc, String version) {
return new McpForgeMappingsSpec(
getGeneration().get() == 1
? FileSpec.create(String.format(Constants.CALAMUS_INTERMEDIARY_MAVEN_GROUP + ":" + Constants.CALAMUS_GEN1_MAPPINGS, mc))
: FileSpec.create(String.format(Constants.CALAMUS_INTERMEDIARY_MAVEN_GROUP + ":" + Constants.CALAMUS_GEN2_MAPPINGS, getGeneration().get(), mc)),
FileSpec.create(String.format(Constants.FORGE_MAVEN_GROUP+ ":" + Constants.FORGE_SRC, mc, version))
? FileSpec.create(String.format(Constants.CALAMUS_GEN1_MAPPINGS, mc))
: FileSpec.create(String.format(Constants.CALAMUS_GEN2_MAPPINGS, getGeneration().get(), mc)),
FileSpec.create(String.format(Constants.FORGE_SRC, mc, version))
);
}

Expand Down

0 comments on commit 5f3f8fd

Please sign in to comment.