Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.1.0 #114

Merged
merged 64 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
13d12d3
Merge pull request #86 from LandOfRails/main
Danielxs01 May 9, 2023
6d90a97
Added mcmod.info to versioncommit in release workflow
MarkenJaden May 10, 2023
c75cfe1
Might fix workflow failure when files are up-to-date
MarkenJaden May 10, 2023
5e0b784
[#88] Removed redundant cache, removed cacheInfoOldContentPack
Danielxs01 May 11, 2023
434a5ae
Merge pull request #89 from LandOfRails/feature/issue-88-remove-dupli…
Danielxs01 May 11, 2023
280b55f
Added "-" between version and suffix
MarkenJaden May 11, 2023
7af9f72
Fixed dumb bug with missing "-"
MarkenJaden May 11, 2023
2d84289
[#91] Added 90° versions of stellwand blocks except of streckenblock
Danielxs01 May 13, 2023
562e447
Fixed missing logging parameter in ContentPackHandlerV2#load
MarkenJaden May 15, 2023
015db4c
Unified publish workflows
MarkenJaden May 15, 2023
2eb199a
Removed dumb "-" for SUFFIX
MarkenJaden May 15, 2023
2941f05
Updated mod version
MarkenJaden May 15, 2023
ae74bf1
Fixed missing "," for mcmod.info
MarkenJaden May 15, 2023
d2b2cea
Merge remote-tracking branch 'origin/develop' into develop
MarkenJaden May 15, 2023
83d6763
Updated mod version
MarkenJaden May 15, 2023
8eca8bf
Updated workflows according to https://github.blog/changelog/2022-10-…
MarkenJaden May 15, 2023
f241bb1
Updated workflows using new github actions to publish mod
MarkenJaden May 15, 2023
b44537a
Commented out CurseForge cause the newest version is already there
MarkenJaden May 15, 2023
5e5ab1c
Updated workflow to use input choice instead of three different but y…
MarkenJaden May 15, 2023
2674243
Added missing "choice" type
MarkenJaden May 15, 2023
c90dc36
Removed 1.7.10 cause forge is shit
MarkenJaden May 15, 2023
4ab7de6
Test upload & download artifacts
MarkenJaden May 15, 2023
d7feb0b
Added dependency to jobs
MarkenJaden May 15, 2023
74b8739
Removed trigger on workflow change
MarkenJaden May 15, 2023
b57b711
Removed other version for testing
MarkenJaden May 15, 2023
1990a76
Complete test
MarkenJaden May 15, 2023
8157b90
Fixed dumbness :D
MarkenJaden May 15, 2023
a3d9cd8
Fixed game-versions
MarkenJaden May 15, 2023
b5e7f35
Fixed duplicate github publish
MarkenJaden May 15, 2023
3c4c3bc
Moved checkout to top
MarkenJaden May 15, 2023
613f552
Apply 1.7.10 patch correctly
MarkenJaden May 17, 2023
71e684b
Added ./ to changelog-file
MarkenJaden May 17, 2023
a39c98f
Readded CurseForge to publish workflow
MarkenJaden May 17, 2023
d327846
[#91] Fix NullPointerException,
Danielxs01 May 23, 2023
b7fbe6a
[#98] Added preloading mechanism (optional)
Danielxs01 May 25, 2023
cbfa9cc
Merge pull request #99 from LandOfRails/feature/issue-98-1710-1165-ad…
Danielxs01 May 26, 2023
6d7bb1f
[#91] Replaced textures for hsigright and unisolated
Danielxs01 May 26, 2023
9081374
Merge remote-tracking branch 'origin/develop' into feature/issue-91-1…
Danielxs01 May 26, 2023
4a22248
[#91] Fixed merge conflicts with develop
Danielxs01 May 26, 2023
62ce139
Merge pull request #101 from LandOfRails/feature/issue-91-1710-1165-9…
Danielxs01 May 26, 2023
c6589b7
[#103] ItemManipulator - Offset and Translation works
Danielxs01 May 30, 2023
4f211b2
[#103] ItemManipulator - Scaling added
Danielxs01 May 30, 2023
c485a40
[#103] Fixed issues with GUIs opening after using the manipulator item
Danielxs01 May 30, 2023
e8d6510
[#103] Added "cascade changes" option to manipulator
Danielxs01 May 31, 2023
7854d26
[#103] Added text hint for leftclick/rightclick behaviour
Danielxs01 Jun 1, 2023
ea86dfb
[#103] Added reset-function
Danielxs01 Jun 5, 2023
d964e2e
Merge pull request #104 from LandOfRails/feature/issue-103-reactivate…
MarkenJaden Jun 7, 2023
f8a6ddd
[#106] Added magnifyingglass (first attempt)
Danielxs01 Jun 11, 2023
a94050f
[#108] Current state of dynamic scaling
Danielxs01 Jun 15, 2023
4c71a0c
[#108] Removed height limit and added rescale upper bound
Danielxs01 Jun 15, 2023
313d018
Moved toggleHighlighting to method
MarkenJaden Jun 18, 2023
d53aa8e
Properly formatted changes to trigger build pipeline (and improve cod…
MarkenJaden Jun 18, 2023
1c32783
Added .editorconfig
MarkenJaden Jun 18, 2023
7da891a
[#108] Improved ProgressBar usage
Danielxs01 Jun 21, 2023
743d57f
Merge remote-tracking branch 'origin/feature/issue-108-dynamic-item-s…
Danielxs01 Jun 21, 2023
a83f05d
[#106] Make signals display their signalboxes
Danielxs01 Jun 21, 2023
ad2aabf
Merge pull request #107 from LandOfRails/feature/issue-106-reactivate…
Danielxs01 Jun 27, 2023
75743cc
[#109] Fixed issues with ContentPackComplexSignal
Danielxs01 Jul 8, 2023
6221989
Merge pull request #110 from LandOfRails/feature/issue-109-blockcompl…
Danielxs01 Jul 8, 2023
0528b55
[#108] Improved config-comment
Danielxs01 Jul 9, 2023
d597317
Merge pull request #111 from LandOfRails/feature/issue-108-dynamic-it…
Danielxs01 Jul 10, 2023
761cd1e
Issue-112 version set to 1.1.0
Danielxs01 Jul 10, 2023
5804e31
[#112] Set version to 1.1.0 and updated CHANGELOG.md
Danielxs01 Jul 27, 2023
914e774
Merge pull request #113 from LandOfRails/feature/release-preparation-…
Danielxs01 Jul 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,457 changes: 1,457 additions & 0 deletions .editorconfig

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
push:
paths:
- 'src/**'
- '.github/workflows/**'
# - '.github/workflows/**'

workflow_dispatch:

Expand All @@ -17,36 +17,36 @@ 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 ]

steps:
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
distribution: 'temurin'
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
- name: Gradle compile
run: ./gradlew classes
- name: Process images
run: find src/main/resources/assets/landofsignals/ | grep png | xargs -I foo pngquant -s1 -f --ext .png foo
- name: Run Data (optionalish)
run: xvfb-run --auto-servernum ./gradlew runData || xvfb-run --auto-servernum ./gradlew runData || true
- name: Gradle build
run: ./gradlew build
- uses: actions/upload-artifact@v3
with:
name: LandOfSignals ${{matrix.branch}}
path: build/libs/LandOfSignals-${{matrix.branch}}-*
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
distribution: 'temurin'
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
- name: Gradle compile
run: ./gradlew classes
- name: Process images
run: find src/main/resources/assets/landofsignals/ | grep png | xargs -I foo pngquant -s1 -f --ext .png foo
- name: Run Data (optionalish)
run: xvfb-run --auto-servernum ./gradlew runData || xvfb-run --auto-servernum ./gradlew runData || true
- name: Gradle build
run: ./gradlew build
- uses: actions/upload-artifact@v3
with:
name: LandOfSignals ${{matrix.branch}}
path: build/libs/LandOfSignals-${{matrix.branch}}-*
187 changes: 187 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
name: LandOfSignals Publish Pipeline

on:
workflow_dispatch:
inputs:
type:
description: 'Type of release'
required: true
default: 'release'
type: choice
options:
- alpha
- beta
- release

jobs:
versioncommit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.PAT }}

- name: Read VERSION file
id: getversion
run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
- name: Read SUFFIX file
id: getsuffix
run: echo "suffix=$(cat SUFFIX)" >> $GITHUB_OUTPUT
- 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
- name: Commit and push changes
run: |
git config --global user.name "MarkenJaden"
git config --global user.email "[email protected]"
git add -A
git diff-index --quiet HEAD || git commit -m "Updated mod version"
git push

build:
runs-on: ubuntu-latest
needs: [ versioncommit ]
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 ]
include:
- branch: 1.7.10-forge
version: 1.7.10
- branch: 1.10.2-forge
version: 1.10.2
- branch: 1.11.2-forge
version: 1.11.2
- branch: 1.12.2-forge
version: 1.12.2
- branch: 1.14.4-forge
version: 1.14.4
- branch: 1.15.2-forge
version: 1.15.2
- branch: 1.16.5-forge
version: 1.16.5
steps:
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
distribution: 'temurin'
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
- name: Gradle compile
run: ./gradlew classes
- name: Process images
run: find src/main/resources/assets/landofsignals/ | grep png | xargs -I foo pngquant -s1 -f --ext .png foo
- name: Run Data (optionalish)
run: xvfb-run --auto-servernum ./gradlew runData || xvfb-run --auto-servernum ./gradlew runData || true
- name: Gradle build
run: ./gradlew build -Dtarget=release
- name: Read CHANGELOG.md file
id: getchangelog
uses: juliangruber/[email protected]
with:
path: ./CHANGELOG.md
- name: Read VERSION file
id: getversion
run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
- name: Read SUFFIX file
id: getsuffix
run: echo "suffix=$(cat SUFFIX)" >> $GITHUB_OUTPUT
- name: Rename with suffix
run: mv -n build/libs/LandOfSignals-${{matrix.branch}}-${{ steps.getversion.outputs.version }}.jar build/libs/LandOfSignals-${{matrix.branch}}-${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}.jar
- uses: actions/upload-artifact@v3
with:
name: LandOfSignals ${{matrix.branch}}
path: build/libs/LandOfSignals-${{matrix.branch}}-${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}.jar
- name: Upload ${{matrix.branch}}
uses: Kir-Antipov/mc-publish@master
with:
# Modrinth
modrinth-id: r7aBIx6Q
modrinth-featured: true
modrinth-unfeature-mode: subset
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

# CurseForge
curseforge-id: 434307
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
curseforge-dependencies: |
universal-mod-core | depends | *

files: build/libs/LandOfSignals-${{matrix.branch}}-${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}.jar

version: ${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}
version-type: ${{ inputs.type }}
changelog-file: ./CHANGELOG.md

loaders: |
forge
game-versions: |
${{ matrix.version }}
java: |
8

retry-attempts: 2
retry-delay: 10000
fail-mode: fail

package:
runs-on: ubuntu-latest
needs: [ build ]
steps:
- uses: actions/checkout@v3
- name: Read VERSION file
id: getversion
run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
- name: Read SUFFIX file
id: getsuffix
run: echo "suffix=$(cat SUFFIX)" >> $GITHUB_OUTPUT
- uses: actions/download-artifact@v3
- run: mkdir upload
- run: cp **/LandOfSignals-*.jar upload
- name: Upload to GitHub
uses: Kir-Antipov/mc-publish@master
with:
# GitHub
github-tag: v${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}
github-generate-changelog: true
github-draft: false
github-prerelease: false
github-discussion: Announcements
github-token: ${{ secrets.GITHUB_TOKEN }}

files: upload/LandOfSignals-*.jar

version: ${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}
version-type: ${{ inputs.type }}
changelog-file: ./CHANGELOG.md

loaders: |
forge
game-versions: |
1.7.10
1.10.2
1.11.2
1.12.2
1.14.4
1.15.2
1.16.5
java: |
8

retry-attempts: 2
retry-delay: 10000
fail-mode: fail
108 changes: 0 additions & 108 deletions .github/workflows/release-alpha.yml

This file was deleted.

Loading