MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.14: Forge testing update: Forge 1.14.4-28.0.40/20190719-1.14.3.

Browse source
This commit is contained in:
stfwi 2019-08-04 14:34:20 +02:00
parent 749e5ac7e0
commit c188f732e8
7 changed files with 117 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meta/lib/constants.js
View file

@ -1,13 +1,15 @@
"use strict";
(function(){
var c = {};
c.mod_registry_name = function() { return "engineersdecor" }
c.modid = "engineersdecor";
c.mod_registry_name = function() { return c.modid; }
c.local_assets_root = function() { return "src/main/resources/assets/" + c.mod_registry_name(); }
c.reference_repository = function() { return "git@github.com:stfwi/engineers-decor.git"; }
c.gradle_property_modversion = function() { return "version_engineersdecor"; }
c.gradle_property_version_minecraft = function() { return "version_minecraft"; }
c.gradle_property_version_forge = function() { return "version_forge"; }
c.project_download_inet_page = function() { return "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/"; }
c.options = {}; // don't freeze that
c.languages = {
"en_us": { code:"en_us", name:"English", region:"United States" },
"de_de": { code:"de_de", name:"German", region:"Germany" },

31
meta/lib/libtask.js
View file

@ -104,6 +104,24 @@
return properties;
}
/**
* Returns an object containing the version data for MC, forge, the
* mod, and the combined mod version.
*/
me.parsing.version_data = function() {
const properties = me.parsing.gradle_properties("gradle.properties");
const version_minecraft = properties[constants.gradle_property_version_minecraft()];
const version_forge = properties[constants.gradle_property_version_forge()];
const version_mod = properties[constants.gradle_property_modversion()];
const combined_version = version_minecraft + "-" + version_mod;
return {
minecraft: version_minecraft,
forge: version_forge,
mod: version_mod,
combined: combined_version
}
};
/**
* Changes one tab to two spaces in files with the given extension
* recursively found in the current working directory.
@ -202,14 +220,19 @@
if(line.trim().indexOf(constants.gradle_property_modversion())!=0) return false;
return line.replace(/^.*?=/,"").trim()
}).trim();
const mcversion = fs.readfile("gradle.properties", function(line){
if(line.trim().indexOf("version_minecraft")!=0) return false;
return line.replace(/^.*?=/,"").trim()
}).trim();
const git_remote = sys.shell("git remote -v").trim();
const git_branch = sys.shell("git rev-parse --abbrev-ref HEAD").trim();
const git_diff = sys.shell("git diff .").trim();
var fails = [];
if(modversion=="") fails.push("Could not determine '"+ constants.gradle_property_modversion() +"' from gradle properties.");
if(!gittags.length) fails.push("Version not tagged.");
if(!gittags.filter(function(s){return s.indexOf(modversion.replace(/[-]/g,""))>=0}).length) fails.push("No tag version not found matching the gradle properties version.");
if(git_remote.replace(/[\s]/g,"").indexOf(constants.reference_repository() + "(push)") < 0) fails.push("Not the reference repository.");
const expected_commit_version = modversion.replace(/[-]/g,"") + "-mc" + mcversion;
if(!gittags.filter(function(s){return s.indexOf(expected_commit_version)>=0}).length) fails.push("No tag version on this commit matching the gradle properties version (should be v" + expected_commit_version + ").");
if(((!constants.options.without_ref_repository_check)) && (git_remote.replace(/[\s]/g,"").indexOf(constants.reference_repository() + "(push)") < 0)) fails.push("Not the reference repository.");
if((git_branch != "develop") && (git_branch != "master")) {
fails.push("No valid branch for dist. (branch:'"+git_branch+"')");
} else if((git_branch == "develop") && (modversion.replace(/[^ab]/g,"")=="")) {
@ -312,8 +335,10 @@
stdtasks["version-html"] = function() {
if(!fs.isdir("dist")) throw new Error("'dist' directory does not exist.");
const hist = me.parsing.readme_history_section("readme.md");
const version = me.parsing.version_data().combined;
const modid = constants.modid;
const html = "<pre>\n" + (hist.replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;")) + "\n</pre>";
fs.writefile("dist/revision-history.html", html);
fs.writefile("dist/" + modid + "-" + version + ".html", html);
};
stdtasks["tabs-to-spaces"] = function() {
me.sanatizing.tabs_to_spaces(['java','lang']);

17
meta/update.json
View file

@ -1,5 +1,13 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"promos": {
"1.12.2-recommended": "1.0.9",
"1.12.2-latest": "1.0.10-b1",
"1.13.2-recommended": "",
"1.13.2-latest": "1.0.7-b5",
"1.14.4-recommended": "",
"1.14.4-latest": "1.0.9-b9"
},
"1.12.2": {
"1.0.10-b1": "[A] Treated wood side table added.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[A] Added Exit Sign (texture design by J. Carver).",
"1.0.9": "[R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. * Block hardness adaptions. * 1st/3rd person item model fixes. * Furnace initialisation issue fixed.",
@ -63,6 +71,7 @@
"1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta."
},
"1.14.4": {
"1.0.9-b9": "[U] Update to Forge 1.14.4-28.0.40/20190719-1.14.3 for Forge testing.",
"1.0.9-b8": "[U] UPDATE TO 1.14.4. Forge 1.14.4-28.0.11/20190719-1.14.3.",
"1.0.9-b7": "[U] Updated to Forge 1.14.3-27.0.60/20190719-1.14.3.\n[F] Disabled all early implemented fuild handling of valves and the Fluid Accumulator to prevent world loading hang-ups (issue #42, thx TheOhmegha for reporting). Will be re-enabled after fluid handling released in Forge.\n[F] Fixed blockstate model locations for signs and crafting table (issue #43, thx ProsperCraft for the beta test).",
"1.0.9-b6": "[U] Updated to Forge 1.14.3-27.0.50/20190621-1.14.2.",
@ -77,13 +86,5 @@
"1.0.7-b5": "[U] Updated to Forge BETA 1.14.2-26.0.35/20190608-1.14.2.\n[A] Factory dropper functionality ported.\n[A] Small lab furnace functionality ported.\n[A] Small electrical lab furnace functionality ported.\n[A] Small waste incinerator functionality ported.\n[A] Fluid valves, Passive Fluid Accumulator ported.\n[I] Issue: Scoped recipe constants still not working.",
"1.0.7-b4": "[U] Updated to Forge BETA 1.14.2-26.0.32/20190608-1.14.2.\n[A] Sitting on the stool ported.\n[A] Ladder climbing speed boost ported.\n[A] Crafting table functionality ported.\n[I] Issue: Scoped recipe constants not working yet with the current Forge version (or somehow changed).",
"1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
},
"promos": {
"1.12.2-recommended": "1.0.9",
"1.12.2-latest": "1.0.10-b1",
"1.13.2-recommended": "",
"1.13.2-latest": "1.0.7-b5",
"1.14.4-recommended": "",
"1.14.4-latest": "1.0.9-b8"
}
}