Skip to content

Commit c563d0c

Browse files
committed
style: a lot of stuff
Signed-off-by: ok-coder1 <[email protected]>
1 parent 648a1e9 commit c563d0c

File tree

86 files changed

+117
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+117
-142
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66

77
# These are Windows script files and should use crlf
88
*.bat text eol=crlf
9-

.github/workflows/build.yml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ name: build
77
on: [pull_request, push, workflow_dispatch]
88

99
jobs:
10-
build-java-17:
11-
name: Build on Java 17
10+
build-java:
11+
name: Build on Java
1212
runs-on: ubuntu-latest
13+
matrix:
14+
java-version: [21, 17]
1315
steps:
1416
- name: Checkout repository
1517
uses: actions/checkout@v4
@@ -20,7 +22,7 @@ jobs:
2022
- name: Setup JDK
2123
uses: actions/setup-java@v4
2224
with:
23-
java-version: 17
25+
java-version: ${{ matrix.java-version }}
2426
distribution: microsoft
2527
- name: Make Gradle wrapper executable
2628
run: chmod +x ./gradlew
@@ -29,32 +31,6 @@ jobs:
2931
- name: Capture build artifacts
3032
uses: actions/upload-artifact@v4
3133
with:
32-
name: matrix-blocks-java-17
33-
path: build/libs/*.jar
34-
if-no-files-found: error
35-
36-
build-java-21:
37-
name: Build on Java 21
38-
runs-on: ubuntu-latest
39-
steps:
40-
- name: Checkout repository
41-
uses: actions/checkout@v4
42-
with:
43-
fetch-depth: 0
44-
- name: Validate Gradle wrapper
45-
uses: gradle/actions/wrapper-validation@v4
46-
- name: Setup JDK
47-
uses: actions/setup-java@v4
48-
with:
49-
java-version: 21
50-
distribution: microsoft
51-
- name: Make Gradle wrapper executable
52-
run: chmod +x ./gradlew
53-
- name: Build
54-
run: ./gradlew build
55-
- name: Capture build artifacts
56-
uses: actions/upload-artifact@v4
57-
with:
58-
name: matrix-blocks-java-21
34+
name: matrix-blocks-java-${{ matrix.java-version }}
5935
path: build/libs/*.jar
6036
if-no-files-found: error

.github/workflows/pr-compile.yml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: Compile Java
22
on: [pull_request, workflow_dispatch]
33

44
jobs:
5-
compile-java-17:
6-
name: Compile on Java 17
5+
compile-java:
6+
name: Compile Java
77
runs-on: ubuntu-latest
8+
matrix:
9+
java-version: [21, 17]
810
steps:
911
- name: Checkout repository
1012
uses: actions/checkout@v4
@@ -15,34 +17,11 @@ jobs:
1517
- name: Setup JDK
1618
uses: actions/setup-java@v4
1719
with:
18-
java-version: 17
20+
java-version: ${{ matrix.java-version }}
1921
distribution: microsoft
2022
- name: Make Gradle wrapper executable
2123
run: chmod +x ./gradlew
2224
- name: Compile Java
2325
run: ./gradlew compileJava
2426
- name: Compile client-side Java
2527
run: ./gradlew compileClientJava
26-
27-
compile-java-21:
28-
name: Compile on Java 21
29-
runs-on: ubuntu-latest
30-
steps:
31-
- name: Checkout repository
32-
uses: actions/checkout@v4
33-
with:
34-
fetch-depth: 0
35-
- name: Validate Gradle wrapper
36-
uses: gradle/actions/wrapper-validation@v4
37-
- name: Setup JDK
38-
uses: actions/setup-java@v4
39-
with:
40-
java-version: 21
41-
distribution: microsoft
42-
- name: Make Gradle wrapper executable
43-
run: chmod +x ./gradlew
44-
- name: Compile Java
45-
run: ./gradlew compileJava
46-
- name: Compile client-side Java
47-
run: ./gradlew compileClientJava
48-

.github/workflows/todo.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,37 @@ on:
33
push:
44
branches:
55
- master
6+
67
jobs:
7-
build:
8+
todo:
9+
name: TODO to Issue
810
runs-on: ubuntu-latest
911
permissions:
12+
contents: write
1013
issues: write
14+
pull-requests: write
1115
steps:
1216
- name: Checkout repository
1317
uses: actions/checkout@v4
1418
with:
15-
fetch-depth: 0
16-
19+
fetch_depth: 0
20+
1721
- name: TODO to Issue
1822
uses: alstr/todo-to-issue-action@v5
23+
with:
24+
INSERT_ISSUE_URLS: "true"
25+
26+
- name: Set Git user
27+
run: |
28+
git config --global user.name "github-actions[bot]"
29+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
30+
31+
- name: Commit and Push Changes
32+
run: |
33+
git add -A
34+
if [[ `git status --porcelain` ]]; then
35+
git commit -m "chore: add GitHub issue links to TODOs"
36+
git push origin master
37+
else
38+
echo "No changes to commit"
39+
fi

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ express Statement of Purpose.
118118
Work.
119119
d. Affirmer understands and acknowledges that Creative Commons is not a
120120
party to this document and has no duty or obligation with respect to
121-
this CC0 or use of the Work.
121+
this CC0 or use of the Work.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ publishing {
8787
// The repositories here will be used for publishing your artifact, not for
8888
// retrieving dependencies.
8989
}
90-
}
90+
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ maven_group=com.okcoder1.matrixblocks
1515
archives_base_name=matrix-blocks
1616

1717
# Dependencies
18-
fabric_version=0.97.2+1.20.4
18+
fabric_version=0.97.2+1.20.4

matrix-blocks.code-workspace

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
}
66
],
77
"settings": {}
8-
}
8+
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ pluginManagement {
77
mavenCentral()
88
gradlePluginPortal()
99
}
10-
}
10+
}

src/main/java/com/okcoder1/matrixblocks/MatrixBlocks.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ public void onInitialize() {
1414
ModBlocks.initialize();
1515
LOGGER.info("Matrix Blocks has initialized.");
1616
}
17-
}
17+
}

0 commit comments

Comments
 (0)