From cae5e55cf5a3091270a87927292176e3179c89ac Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Sat, 20 Nov 2021 17:49:07 +0100 Subject: [PATCH] Tweak build script --- gradle.properties | 6 +++--- .../codechicken/core/asm/CodeChickenCoreModContainer.java | 2 +- .../codechicken/core/launch/CodeChickenCorePlugin.java | 2 +- src/main/resources/dependencies.info | 6 +++--- src/main/resources/{cccmod.info => mcmod.info} | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) rename src/main/resources/{cccmod.info => mcmod.info} (60%) diff --git a/gradle.properties b/gradle.properties index cf07ab4..5da4b16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -modName = CodeChickenCore +modName = CodeChicken Core # This is a case-sensitive string to identify your mod. Convention is to use lower case. modId = CodeChickenCore @@ -26,7 +26,7 @@ developmentEnvironmentUserName = "Developer" # The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]) # Leave these properties empty to skip individual token replacements -replaceGradleTokenInFile = +replaceGradleTokenInFile = CodeChickenCorePlugin.java gradleTokenModId = gradleTokenModName = gradleTokenVersion = @@ -53,7 +53,7 @@ mixinsPackage = coreModClass = core.launch.CodeChickenCorePlugin # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! -containsMixinsAndOrCoreModOnly = false +containsMixinsAndOrCoreModOnly = true # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your # responsibility check the licence and request permission for distribution, if required. diff --git a/src/main/java/codechicken/core/asm/CodeChickenCoreModContainer.java b/src/main/java/codechicken/core/asm/CodeChickenCoreModContainer.java index ef5f457..dbe05f7 100644 --- a/src/main/java/codechicken/core/asm/CodeChickenCoreModContainer.java +++ b/src/main/java/codechicken/core/asm/CodeChickenCoreModContainer.java @@ -32,7 +32,7 @@ public class CodeChickenCoreModContainer extends DummyModContainer } public CodeChickenCoreModContainer() { - super(MetadataCollection.from(MetadataCollection.class.getResourceAsStream("/cccmod.info"), "CodeChickenCore").getMetadataForId("CodeChickenCore", null)); + super(MetadataCollection.from(MetadataCollection.class.getResourceAsStream("/mcmod.info"), "CodeChickenCore").getMetadataForId("CodeChickenCore", null)); } @Override diff --git a/src/main/java/codechicken/core/launch/CodeChickenCorePlugin.java b/src/main/java/codechicken/core/launch/CodeChickenCorePlugin.java index 61aeb82..5ff5ebf 100644 --- a/src/main/java/codechicken/core/launch/CodeChickenCorePlugin.java +++ b/src/main/java/codechicken/core/launch/CodeChickenCorePlugin.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.Logger; public class CodeChickenCorePlugin implements IFMLLoadingPlugin, IFMLCallHook { public static final String mcVersion = "[1.7.10]"; - public static final String version = "${mod_version}"; + public static final String version = "GRADLETOKEN_VERSION"; public static File minecraftDir; public static String currentMcVersion; diff --git a/src/main/resources/dependencies.info b/src/main/resources/dependencies.info index c40cb0a..aff2dba 100644 --- a/src/main/resources/dependencies.info +++ b/src/main/resources/dependencies.info @@ -1,7 +1,7 @@ { - "repo": "http://files.minecraftforge.net/maven/codechicken/CodeChickenLib/${mc_version}-${ccl_version}/", - "file": "CodeChickenLib-${mc_version}-${ccl_version}-universal.jar", - "dev": "CodeChickenLib-${mc_version}-${ccl_version}-dev.jar", + "repo": "http://files.minecraftforge.net/maven/codechicken/CodeChickenLib/1.7.10-1.1.3.138/", + "file": "CodeChickenLib-1.7.10-1.1.3.138-universal.jar", + "dev": "CodeChickenLib-1.7.10-1.1.3.138-dev.jar", "class": "codechicken.lib.asm.ASMHelper", "coreLib": true } \ No newline at end of file diff --git a/src/main/resources/cccmod.info b/src/main/resources/mcmod.info similarity index 60% rename from src/main/resources/cccmod.info rename to src/main/resources/mcmod.info index aedcd8d..3c0ca94 100644 --- a/src/main/resources/cccmod.info +++ b/src/main/resources/mcmod.info @@ -1,12 +1,12 @@ [ { - "modid": "CodeChickenCore", - "name": "CodeChicken Core", + "modid": "${modId}", + "name": "${modName}", "description": "Base common code for all chickenbones mods. Supporters: JBoyJr", - "version": "${version}", - "mcversion": "${mc_version}", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", "url": "http://www.minecraftforum.net/topic/909223", "authorList": [ "ChickenBones" ] }