diff --git a/1.13/Makefile b/1.13/Makefile index ef6783d..5d98a98 100644 --- a/1.13/Makefile +++ b/1.13/Makefile @@ -24,7 +24,7 @@ wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst # # Targets # -.PHONY: default mod init clean clean-all all run install sanatize dist-check dist start-server +.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server default: mod @@ -42,8 +42,17 @@ clean: clean-all: @echo "[1.13] Cleaning using gradle ..." @rm -f dist/* + @rm -rf run/logs/ + @rm -rf run/crash-reports/ @$(GRADLE) clean cleanCache +mrproper: clean-all + @rm -rf meta/* + @rm -rf run/ + @rm -rf out/ + @rm -f .project + @rm -f .classpath + init: @echo "[1.13] Initialising eclipse workspace using gradle ..." @$(GRADLE) eclipse diff --git a/1.13/build.gradle b/1.13/build.gradle index 5d48315..9b689b8 100644 --- a/1.13/build.gradle +++ b/1.13/build.gradle @@ -12,6 +12,7 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' +apply plugin: 'maven-publish' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' //----------------------------------------------------------------------------- version = "${version_engineersdecor}" @@ -77,3 +78,21 @@ jar { ]) } } + +def reobfFile = file("$buildDir/reobfJar/output.jar") +def reobfArtifact = artifacts.add('default', reobfFile) { + type 'jar' + builtBy 'reobfJar' +} +publishing { + publications { + mavenJava(MavenPublication) { + artifact reobfArtifact + } + } + repositories { + maven { + url "file:///${project.projectDir}/mcmodsrepo" + } + } +} diff --git a/1.13/gradle.properties b/1.13/gradle.properties index b6af3b5..49f2732 100644 --- a/1.13/gradle.properties +++ b/1.13/gradle.properties @@ -2,8 +2,8 @@ org.gradle.daemon=false org.gradle.jvmargs=-Xmx8G version_minecraft=1.13.2 -version_forge_minecraft=1.13.2-25.0.44 -version_engineersdecor=1.0.0-a1 +version_forge_minecraft=1.13.2-25.0.214 +version_engineersdecor=1.0.7-b5 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.13/meta/update.json b/1.13/meta/update.json index ea1dd08..7956ce2 100644 --- a/1.13/meta/update.json +++ b/1.13/meta/update.json @@ -1,6 +1,12 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.13.2": { + "1.0.7-b4": "[A] Added stained clinker brick block/stairs.", + "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).", + "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.", + "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", + "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.", + "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.", "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.", "1.0.2-b2": "[A] Added wall decomposition recipes.\n[A] Added slag brick wall.\n[M] Climbing/descending mod ladders is faster when looking up or down and not sneaking.\n[M] Panzer glass material definition changed.", "1.0.2-b1": "[A] Added Treated wood crafting table.\n[A] Added decomposition recipes for stairs and tiles.\n[N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version).\n[N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items.", @@ -10,6 +16,6 @@ }, "promos": { "1.13.2-recommended": "", - "1.13.2-latest": "1.0.2-b3" + "1.13.2-latest": "1.0.7-b4" } } \ No newline at end of file diff --git a/1.14/.gitignore b/1.14/.gitignore new file mode 100644 index 0000000..af7450c --- /dev/null +++ b/1.14/.gitignore @@ -0,0 +1,37 @@ +bin +*.launch +.settings +.metadata +.classpath +.project +out +*.ipr +*.iws +*.iml +.idea +build +.gradle +*.tmp +*.log +*.jks +eclipse +run +tests +/dist +signing.* +src/main/java/archive +src/main/resources/assets/minecraft +.vscode +/classes +/dev +/tmp +/archive +/assets-src +.gimp +*.xcf +desktop.ini +.DS_Store +Thumbs.db +forge*changelog.txt +/*.txt +mcmodsrepo \ No newline at end of file diff --git a/1.14/Makefile b/1.14/Makefile new file mode 100644 index 0000000..bc23ff6 --- /dev/null +++ b/1.14/Makefile @@ -0,0 +1,78 @@ +# @file Makefile +# @author Stefan Wilhelm (wile) +# @license MIT +# +# GNU Make makefile based build relay. +# Note for reviewers/clones: This file is a auxiliary script for my setup. +# It's not needed to build the mod. +# +MOD_JAR_PREFIX=engineersdecor- +MOD_JAR=$(filter-out %-sources.jar,$(wildcard build/libs/${MOD_JAR_PREFIX}*.jar)) + +ifeq ($(OS),Windows_NT) +GRADLE=gradlew.bat --no-daemon +GRADLE_STOP=gradlew.bat --stop +DJS=djs +else +GRADLE=./gradlew --no-daemon +GRADLE_STOP=./gradlew --stop +DJS=djs +endif + +wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst *,%,$2),$d)) + +# +# Targets +# +.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server + +default: mod + +all: clean clean-all mod | install + +mod: + @echo "[1.14] Building mod using gradle ..." + @$(GRADLE) build $(GRADLE_OPTS) + +clean: + @echo "[1.14] Cleaning ..." + @rm -rf mcmodsrepo + @rm -f build/libs/* + @$(GRADLE) clean + +clean-all: + @echo "[1.14] Cleaning using gradle ..." + @rm -f dist/* + @rm -rf run/logs/ + @rm -rf run/crash-reports/ + @$(GRADLE) clean + +mrproper: clean-all + @rm -rf meta/* + @rm -rf run/ + @rm -rf out/ + @rm -f .project + @rm -f .classpath + +init: + @echo "[1.14] Initialising eclipse workspace using gradle ..." + @$(GRADLE) eclipse + +sanatize: + @echo "[1.14] Running sanatising tasks ..." + @djs tasks.js trailing-whitespaces + @djs tasks.js tabs-to-spaces + @djs tasks.js sync-languages + @djs tasks.js version-check + @djs tasks.js update-json + @git status -s . + +dist-check: + @echo "[1.14] Running dist checks ..." + @djs tasks.js dist-check + +dist: sanatize dist-check clean-all mod + @echo "[1.14] Distribution files ..." + @mkdir -p dist + @cp build/libs/$(MOD_JAR_PREFIX)* dist/ + @djs tasks.js dist diff --git a/1.14/build.gradle b/1.14/build.gradle new file mode 100644 index 0000000..7a2a47d --- /dev/null +++ b/1.14/build.gradle @@ -0,0 +1,98 @@ +// @file build.gradle +// Engineer's decor mod gradle build relay (mc1.13.2) +buildscript { + repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + jcenter() + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + } +} +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'maven-publish' +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' +//----------------------------------------------------------------------------- +version = "${version_engineersdecor}" +group = "wile.engineersdecor" +archivesBaseName = "engineersdecor-${version_minecraft}" + +// def signing = { -> +// def sp = new Properties() +// if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) } +// return sp +// }() + +// def git_version = { -> +// def stdout = new ByteArrayOutputStream() +// exec { +// commandLine 'git', 'log', '-1', '--format=%h' +// standardOutput = stdout +// } +// return stdout.toString().trim() +// }() + +minecraft { + mappings channel: 'snapshot', version: "${version_fml_mappings}" + // accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg') + runs { + client { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + mods { + engineersdecor { + source sourceSets.main + } + } + } + server { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + mods { + engineersdecor { + source sourceSets.main + } + } + } + } +} + +dependencies { + minecraft "net.minecraftforge:forge:${version_forge_minecraft}" +} + +jar { + manifest { + attributes([ + "Specification-Title": "engineersdecor", + "Specification-Vendor": "wilechaote", + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": "${version_engineersdecor}", + "Implementation-Vendor" :"wilechaote", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +def reobfFile = file("$buildDir/reobfJar/output.jar") +def reobfArtifact = artifacts.add('default', reobfFile) { + type 'jar' + builtBy 'reobfJar' +} +publishing { + publications { + mavenJava(MavenPublication) { + artifact reobfArtifact + } + } + repositories { + maven { + url "file:///${project.projectDir}/mcmodsrepo" + } + } +} diff --git a/1.14/gradle.properties b/1.14/gradle.properties new file mode 100644 index 0000000..8705d5d --- /dev/null +++ b/1.14/gradle.properties @@ -0,0 +1,15 @@ +# @file gradle.properties +org.gradle.daemon=false +org.gradle.jvmargs=-Xmx8G +version_minecraft=1.14.2 +version_forge_minecraft=1.14.2-26.0.55 +version_fml_mappings=20190621-1.14.2 +version_engineersdecor=1.0.8-b2 +# +# jar signing data loaded from signing.properties in the project root. +# +#signing.keystore_file= +#signing.keystore_alias= +#signing.keystore_pass= +#signing.keystore_keypass= +#fingerprint_sha1.fp_sha1= diff --git a/1.14/gradle/wrapper/gradle-wrapper.jar b/1.14/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/1.14/gradle/wrapper/gradle-wrapper.jar differ diff --git a/1.14/gradle/wrapper/gradle-wrapper.properties b/1.14/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..949819d --- /dev/null +++ b/1.14/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/1.14/gradlew b/1.14/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/1.14/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/1.14/gradlew.bat b/1.14/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/1.14/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/1.14/meta/update.json b/1.14/meta/update.json new file mode 100644 index 0000000..f5018d5 --- /dev/null +++ b/1.14/meta/update.json @@ -0,0 +1,13 @@ +{ + "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", + "1.14.2": { + "1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.", + "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.14.2-recommended": "", + "1.14.2-latest": "1.0.8-b1" + } +} \ No newline at end of file diff --git a/1.14/readme.md b/1.14/readme.md new file mode 100644 index 0000000..bdf954d --- /dev/null +++ b/1.14/readme.md @@ -0,0 +1,39 @@ + +## Engineer's Decor (MC1.14.2) + +Mod sources for Minecraft version 1.14.2. + +- Description, credits, and features: Please see the readme in the repository root. + +- Compiled mod distribution channel is curseforge: https://www.curseforge.com/minecraft/mc-mods/engineers-decor/files. + +---- +## Version history + + ~ v1.0.8-b2 [U] Updated to Forge BETA 1.14.2-26.0.55/20190621-1.14.2, + code adapted to new mappings. + + - v1.0.8-b1 [V] Feature set of 1.12 ported. + [A] CTRL-SHIFT tooltips ported. + [A] Ported stained clinker block/stairs. + [M] Updated textures. + [I] Issue: Scoped recipe constants still not working. + + - v1.0.7-b5 [U] Updated to Forge BETA 1.14.2-26.0.35/20190608-1.14.2. + [A] Factory dropper functionality ported. + [A] Small lab furnace functionality ported. + [A] Small electrical lab furnace functionality ported. + [A] Small waste incinerator functionality ported. + [A] Fluid valves, Passive Fluid Accumulator ported. + [I] Issue: Scoped recipe constants still not working. + + - v1.0.7-b4 [U] Updated to Forge BETA 1.14.2-26.0.32/20190608-1.14.2. + [A] Sitting on the stool ported. + [A] Ladder climbing speed boost ported. + [A] Crafting table functionality ported. + [I] Issue: Scoped recipe constants not working yet with + the current Forge version (or somehow changed). + + - v1.0.7-b3 [A] Initial 1.14.2 port of decorative blocks. + +---- diff --git a/1.14/tasks.js b/1.14/tasks.js new file mode 100644 index 0000000..1238ee0 --- /dev/null +++ b/1.14/tasks.js @@ -0,0 +1,13 @@ +#!/usr/bin/djs +// Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod. +"use strict"; +const constants = include("../meta/lib/constants.js")(); +const libtask = include("../meta/lib/libtask.js")(constants); +const liblang = include("../meta/lib/liblang.1.13.js")(constants); // 1.14 lang same as 1.13 +var tasks = {}; + +tasks["sync-languages"] = function() { + liblang.sync_languages(); +}; + +libtask.run(tasks, sys.args); diff --git a/tasks.js b/tasks.js index c4a053a..22b2896 100644 --- a/tasks.js +++ b/tasks.js @@ -53,19 +53,27 @@ tasks["sync-main-repository"] = function() { cd_main(); sys.shell("rm -rf documentation meta"); sys.shell("rm -f .gitignore credits.md license Makefile readme.md tasks.js"); - cd_main("1.12"); sys.shell("rm -rf meta src gradle"); - //cd_main("1.13"); sys.shell("rm -rf meta src gradle"); + cd_main("1.12"); sys.shell("rm -rf meta gradle src"); + cd_main("1.13"); sys.shell("rm -rf meta gradle"); + cd_main("1.14"); sys.shell("rm -rf meta gradle src"); cd_dev(); sys.shell("cp -f .gitignore credits.md license Makefile readme.md tasks.js \"" + main_repo_local + "/\"") sys.shell("cp -r documentation meta \"" + main_repo_local + "/\"") - cd_dev("1.12"); - sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.12/\"") - sys.shell("cp -r src gradle meta \"" + main_repo_local + "/1.12/\"") - //@todo uncomment after alpha code cleanup. - cd_dev("1.13"); - sys.shell("cp -f .gitignore readme.md tasks.js \"" + main_repo_local + "/1.13/\"") - //sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.13/\"") - //sys.shell("cp -r src gradle meta \"" + main_repo_local + "/1.13/\"") + { + cd_dev("1.12"); + sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.12/\"") + sys.shell("cp -r gradle meta src \"" + main_repo_local + "/1.12/\"") + } + { + cd_dev("1.13"); + sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.13/\"") + sys.shell("cp -r gradle meta \"" + main_repo_local + "/1.13/\"") + } + { + cd_dev("1.14"); + sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.14/\"") + sys.shell("cp -r gradle meta \"" + main_repo_local + "/1.14/\"") + } cd_main(); print("Main repository changes:"); print(sys.shell("git status -s"))