Merge pull request #138 from LandOfRails/release/umc-2.0

Release/umc 2.0

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        branch: [ 1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge ]
+        branch: [ 1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge, 1.17.1-forge, 1.18.2-forge, 1.19.4-forge, 1.20.1-forge ]
 
     steps:
       - uses: actions/checkout@v3
@@ -28,16 +28,10 @@ jobs:
           java-version: '8'
       - name: Install deps
         run: sudo apt install -y pngquant findutils xvfb
-      - name: Hack Forge Gradle
-        run: mkdir -p ~/.gradle/caches/minecraft/; wget 'https://teamopenindustry.cc/maven/hack/ForgeGradleVersion.json' -O ~/.gradle/caches/minecraft/ForgeGradleVersion.json
       - name: Setup Universal Mod Core (and helpers)
         env:
           BRANCH: ${{ matrix.branch }}
-        run: ./gradlew umc -D umc.loader=${BRANCH} -D ssh.http=true
-      - name: Hack Forge Gradle Part Two
-        env:
-          BRANCH: ${{ matrix.branch }}
-        run: git apply --ignore-space-change --ignore-whitespace ${BRANCH}.patch || true
+        run: java -jar UMCSetup.jar ${BRANCH} https
       - name: Gradle compile
         run: ./gradlew classes
       - name: Process images
@@ -46,7 +40,13 @@ jobs:
         run: xvfb-run --auto-servernum ./gradlew runData || xvfb-run --auto-servernum ./gradlew runData || true
       - name: Gradle build
         run: ./gradlew build
+      - name: Download UMC version used for build
+        run: |
+          umc_link=$(./gradlew showBuildInfo | grep "universalmodcore")
+          wget $umc_link -P build/libs/
       - uses: actions/upload-artifact@v3
         with:
           name: LandOfSignals ${{matrix.branch}}
-          path: build/libs/LandOfSignals-${{matrix.branch}}-*
+          path: |
+            build/libs/LandOfSignals-${{matrix.branch}}-*
+            build/libs/UniversalModCore-*

.github/workflows/publish.yml

@@ -30,8 +30,7 @@ jobs:
       - name: Replace version number with new version
         run: |
           sed -i 's/public static final String VERSION.*/public static final String VERSION = "${{ steps.getversion.outputs.version }}";/' src/main/java/net/landofrails/landofsignals/LandOfSignals.java
-          sed -i "s/String version =.*/String version = '${{ steps.getversion.outputs.version }}'/" ./build.gradle
-          sed -i 's/"version":.*/"version": "${{ steps.getversion.outputs.version }}",/' src/main/resources/mcmod.info
+          sed -i '0,/"version":.*/s//"version": "${{ steps.getversion.outputs.version }}",/' ./umc.json
       - name: Commit and push changes
         run: |
           git config --global user.name "MarkenJaden"
@@ -46,7 +45,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        branch: [ 1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge ]
+        branch: [1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge]
         include:
           - branch: 1.7.10-forge
             version: 1.7.10
@@ -71,16 +70,10 @@ jobs:
           java-version: '8'
       - name: Install deps
         run: sudo apt install -y pngquant findutils xvfb
-      - name: Hack Forge Gradle
-        run: mkdir -p ~/.gradle/caches/minecraft/; wget 'https://teamopenindustry.cc/maven/hack/ForgeGradleVersion.json' -O ~/.gradle/caches/minecraft/ForgeGradleVersion.json
       - name: Setup Universal Mod Core (and helpers)
         env:
           BRANCH: ${{ matrix.branch }}
-        run: ./gradlew umc -D umc.loader=${BRANCH} -D ssh.http=true -Dtarget=release
-      - name: Hack Forge Gradle Part Two
-        env:
-          BRANCH: ${{ matrix.branch }}
-        run: git apply --ignore-space-change --ignore-whitespace ${BRANCH}.patch || true
+        run: java -jar UMCSetup.jar ${BRANCH} https
       - name: Gradle compile
         run: ./gradlew classes
       - name: Process images

.gitignore

@@ -135,6 +135,10 @@ hs_err_pid*
 .gradle
 build/
 
+## Built JARs
+*.jar
+!UMCSetup.jar
+
 # Ignore Gradle GUI config
 gradle-app.setting
 
@@ -152,3 +156,10 @@ gradle-app.setting
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij+all,java,gradle,forgegradle
 /bin/
+
+## Generated
+build.gradle
+UMC.md
+gradle/wrapper/gradle-wrapper.properties
+src/main/java/net/landofrails/landofsignals/Mod.java
+src/main/resources/mcmod.info

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 * Fixed [#127] : Magnifyingglass crashes server
 
+### BACKUP YOUR WORLD BEFORE UPDATING!
 #### Release 1.1.0
 
 Fixed #109 : ContentPackComplexSignal can now be added to a contentpackset
@@ -19,8 +20,19 @@ Added #108 : Implemented dynamic scaling (see config)
 
 #### Release 1.0.4
 
+#### Alpha 1.0.4-UMC-testbuild
+
+Fix crash due to some contentpacks still containing null. Improved logic to prevent this from happening again.
 Fixed missing logging parameter in ContentPackHandlerV2#load
 
+#### Alpha 1.0.3-UMC-testbuild
+
+This build is compatible with current UMC testbuilds in combination with Immersive Railroading testbuilds.
+
+We encourage you to backup your world before updating to this build as it is not excluded that there are still major
+bugs in it. Please report any bugs you find to our [issue tracker](https://github.com/LandOfRails/LandOfSignals/issues)
+or our [discord](https://discord.gg/ykAqHKYjVM).
+
 #### Release 1.0.3
 
 Fixed #82 | 1.7.10 - 1.16.5:\

README.md

@@ -62,7 +62,7 @@ Adds different signalblocks used in a railway lane plan. Preexisting laneblocks
 **IntelliJ | Eclipse**
 
 1. Get the project from GitHub (via git)
-2. ``gradle umc -D umc.loader=1.12.2-forge``
+2. ``java -jar UMCSetup.jar 1.12.2-forge https``
 3. Load gradle changes
 
 You should be ready to go ^^

gradlew

@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,16 +28,16 @@ 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='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
 }
 
-die () {
+die ( ) {
     echo
     echo "$*"
     echo
@@ -82,7 +66,6 @@ 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
@@ -126,11 +109,10 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# 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
@@ -156,30 +138,35 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        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" ;;
+        (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 () {
+save ( ) {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=`save "$@"`
+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" "$@"