From 1ecd569a28e299751d1d36e0962dfe077e39b401 Mon Sep 17 00:00:00 2001 From: Grumpyaaa <97306432+martemen@users.noreply.github.com> Date: Tue, 24 Jan 2023 17:25:39 +0200 Subject: [PATCH 1/3] Updated Gradle version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 22172ad59..a4e35a1e1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip From 77a029f8b4835176cd2ef5443bbd5b72ad1db1cc Mon Sep 17 00:00:00 2001 From: Grumpyaaa <97306432+martemen@users.noreply.github.com> Date: Tue, 24 Jan 2023 17:29:06 +0200 Subject: [PATCH 2/3] ForgeGradle fixes --- build.gradle | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 6a5a8c6b0..9c94bcfa2 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') { + changing = true + } } } @@ -16,6 +18,7 @@ def parsedJson = new groovy.json.JsonSlurper().parseText(jsonFile.text) version = parsedJson.version group = "com.hbm" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "HBM-NTM" +compileJava.options.encoding = 'UTF-8' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' @@ -62,17 +65,17 @@ repositories { } dependencies { - compile 'codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev' + implementation 'codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev' compileOnly 'codechicken:CodeChickenCore:1.7.10-1.0.4.29:src' - compile 'codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev' + implementation 'codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev' compileOnly 'codechicken:CodeChickenLib:1.7.10-1.1.3.140:src' - compile 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev' + implementation 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev' compileOnly 'codechicken:NotEnoughItems:1.7.10-1.0.3.74:src' //compileOnly 'inventory-tweaks:InventoryTweaks:1.62+beta.84:api' - compile "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api" + implementation "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api" } processResources { From 81fe902092022e843fc6c67ba56b73b542ab4a9c Mon Sep 17 00:00:00 2001 From: Grumpyaaa <97306432+martemen@users.noreply.github.com> Date: Wed, 1 Feb 2023 17:52:04 +0200 Subject: [PATCH 3/3] Gradle properties, all credits go to @Toshayo --- build.gradle | 21 +++++++++++++-------- gradle.properties | 13 +++++++++++++ src/main/resources/mcmod.info | 4 ++-- 3 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 9c94bcfa2..bd386126f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,17 +5,16 @@ buildscript { mavenCentral() } dependencies { - classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') { - changing = true - } + classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') {changing = true} } } apply plugin: 'forge' - -def jsonFile = file('./src/main/resources/mcmod.info') -def parsedJson = new groovy.json.JsonSlurper().parseText(jsonFile.text) -version = parsedJson.version +def version_name = version = mod_version +if(!mod_build_number.isEmpty()) { + version_name = mod_version + "_X" + mod_build_number + version = "[${version_name}]" +} group = "com.hbm" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "HBM-NTM" compileJava.options.encoding = 'UTF-8' @@ -88,7 +87,13 @@ processResources { include 'mcmod.info' // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version + filesMatching('mcmod.info') { + // replace version, mcversion and credits + expand([ + version: version_name, + credits: project.credits + ]) + } } // copy everything else, thats not the mcmod.info diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..501e7bb72 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +mod_version=1.0.27 +# Empty build number makes a release type +mod_build_number=4480 + +credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\ + \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting),\ + \ UFFR (fork with all sorts of features), Pu-238 (Tom impact effects), Bismarck (chinese localization),\ + \ Frooz (models), Minecreep (models), VT-6/24 (models, textures), Pheo (textures, various machines, weapons), Vær (fibrosis, gas centrifuges,\ + \ ZIRNOX, CP-1 parts, starter guide), Adam29 (liquid petroleum, ethanol, electric furnace),\ + \ Pashtet (russian localization), MartinTheDragon (calculator, chunk-based fallout), haru315 (spiral point algorithm),\ + \ Sten89 (models), Pixelguru26 (textures), TheBlueHat (textures), Aionoso (GUI textures), impbk2002 (project settings),\ + \ OvermindDL1 (project settings), TehTemmie (reacher radiation function), Toshayo (improved satellite loot system), Silly541 (config for safe ME drives),\ + \ Voxelstice (OpenComputers integration), Pvndols (thorium fuel recipe) \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 213ba0ecf..3017b800a 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,11 +3,11 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4480", + "version":"${version}", "mcversion": "1.7.10", "url": "", "updateUrl": "", - "credits": "HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms), Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting), UFFR (fork with all sorts of features), Pu-238 (Tom impact effects), Bismarck (chinese localization), Frooz (models), Minecreep (models), VT-6/24 (models, textures), Pheo (textures, various machines, weapons), Vær (fibrosis, gas centrifuges, ZIRNOX, CP-1 parts, starter guide), Adam29 (liquid petroleum, ethanol, electric furnace), Pashtet (russian localization), MartinTheDragon (calculator, chunk-based fallout), haru315 (spiral point algorithm), Sten89 (models), Pixelguru26 (textures), TheBlueHat (textures), Aionoso (GUI textures), impbk2002 (project settings), OvermindDL1 (project settings), TehTemmie (reacher radiation function), Toshayo (improved satellite loot system), Silly541 (config for safe ME drives), Voxelstice (OpenComputers integration), Pvndols (thorium fuel recipe)", + "credits": "${credits}", "logoFile": "", "screenshots": [], "dependencies": []