RepoMirrors/kami-blue
1
0
Fork 1
mirror of https://github.com/kami-blue/client synced 2025-03-07 06:47:32 +00:00
Code Issues Releases Wiki Activity

completely redo versioning to use commits for travis builds

Browse Source
This commit is contained in:
Bella 2020-03-10 19:20:22 -04:00
parent b93bf36424
commit b073f36c16
No known key found for this signature in database
GPG Key ID: 03B01AC937D1C89C
8 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx3G
modGroup=me.zeroeightsix
modVersion=v1.1.2-03-09-01
modVersion=1.1.2-beta
modBaseName=kamiblue
forgeVersion=1.12.2-14.23.5.2847
mcpVersion=stable_39

1
scripts/curBeta Normal file
View File

@ -0,0 +1 @@
\-beta

1
scripts/curVer Normal file
View File

@ -0,0 +1 @@
v1.1.2

13
scripts/fullVer.sh
View File

@ -1,13 +0,0 @@
#!/bin/sh
# Created by S-B99 on 19/02/20
# echo "Usage: ./fullVer.sh v2.0.0"
sed -i "s/modVersion=.*/modVersion=$1/" gradle.properties
sed -i "s/MODVER = \".*\";/MODVER = \"$1\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
sed -i "s/MODVERSMALL = \".*\";/MODVERSMALL = \"$1\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
sed -i "s/\"version\": \".*\",/\"version\": \"${1:1}\",/" src/main/resources/mcmod.info
git reset
git add gradle.properties src/main/java/me/zeroeightsix/kami/KamiMod.java src/main/resources/mcmod.info
git commit -m "[BOT] New Release: $1!"

6
scripts/hook.sh
View File

@ -4,6 +4,6 @@
curl -H "Content-Type: application/json" -X POST -d '{"username": "Github Actions", "content": "**Branch:** '$BRANCH'"}' "$WEBHOOK"
# Upload the release file
CURDIR="$(readlink -f ./build/libs/)"
JARDIR="$(ls "$CURDIR" | grep "release")"
curl -F content=@""$CURDIR"/"$JARDIR"" "$WEBHOOK"
BUILD_DIR="$(readlink -f ./build/libs/)"
JAR_DIR="$(ls "$BUILD_DIR" | grep "release")"
curl -F content=@"$BUILD_DIR/$JAR_DIR" "$WEBHOOK"

4
scripts/preHook.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
CUR_VER="$(cat ./scripts/curVer)"
sed -i "s/modVersion=.*/modVersion=${CUR_VER:1}-$TRAVIS_COMMIT/" gradle.properties

16
scripts/ver.sh
View File

@ -1,16 +1,16 @@
#!/bin/sh
# Created by S-B99 on 19/02/20
# echo "Usage: ./ver.sh v2.0.0 01"
# echo "Usage: ./ver.sh"
dateM=$(date +'%m')
dateD=$(date +'%d')
CUR_VER="$(cat ./scripts/curVer)"
CUR_BETA="$(cat ./scripts/curBeta)"
sed -i "s/modVersion=.*/modVersion=$1\-${dateM}\-${dateD}\-$2/" gradle.properties
sed -i "s/MODVER = \".*\";/MODVER = \"$1\-${dateM}\-${dateD}\-$2\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
sed -i "s/\"version\": \".*\",/\"version\": \"${1:1}\-${dateM}\-${dateD}\-$2\",/" src/main/resources/mcmod.info
sed -i "s/MODVERSMALL = \".*\";/MODVERSMALL = \"$1\-beta\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
sed -i "s/modVersion=.*/modVersion=$CUR_VER/" gradle.properties
sed -i "s/MODVER = \".*\";/MODVER = \"$CUR_VER\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
sed -i "s/MODVERSMALL = \".*\";/MODVERSMALL = \"$CUR_VER$CUR_BETA\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
sed -i "s/\"version\": \".*\",/\"version\": \"${CUR_VER:1}\",/" src/main/resources/mcmod.info
git reset
git add gradle.properties src/main/java/me/zeroeightsix/kami/KamiMod.java src/main/resources/mcmod.info
git commit -m "[BOT] New beta: $1-${dateD}-${dateM}-$2"
git commit -m "[BOT] New release: $CUR_VER$CUR_BETA"

2
src/main/java/me/zeroeightsix/kami/module/modules/gui/InfoOverlay.java
View File

@ -88,7 +88,7 @@ public class InfoOverlay extends Module {
public ArrayList<String> infoContents() {
ArrayList<String> infoContents = new ArrayList<>();
if (version.getValue()) {
infoContents.add(textColour(firstColour.getValue()) + KamiMod.KAMI_KANJI + textColour(secondColour.getValue()) + " " + KamiMod.MODVER);
infoContents.add(textColour(firstColour.getValue()) + KamiMod.KAMI_KANJI + textColour(secondColour.getValue()) + " " + KamiMod.MODVERSMALL);
} if (username.getValue()) {
infoContents.add(textColour(firstColour.getValue()) + "Welcome" + textColour(secondColour.getValue()) + " " + mc.getSession().getUsername() + "!");
} if (time.getValue()) {