Skip to content

Commit b254706

Browse files
committed
Updated to 1.21.1
1 parent 5fd41fe commit b254706

File tree

19 files changed

+109
-146
lines changed

19 files changed

+109
-146
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Build
33
on:
44
push:
55

6-
env:
7-
DEV_BUILD: true
8-
96
jobs:
107
build:
118
runs-on: ubuntu-latest
@@ -14,7 +11,7 @@ jobs:
1411
- name: Set up JDK
1512
uses: actions/setup-java@v2
1613
with:
17-
java-version: '17'
14+
java-version: '21'
1815
distribution: 'temurin'
1916
cache: 'gradle'
2017
- name: Grant execute permission for gradlew
@@ -23,7 +20,7 @@ jobs:
2320
run: ./gradlew build
2421

2522
- name: Upload artifacts
26-
uses: actions/upload-artifact@v2
23+
uses: actions/upload-artifact@v4
2724
with:
2825
name: Artifacts
2926
path: build/libs/

.github/workflows/publish.yaml

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,53 +8,20 @@ on:
88
required: true
99
type: choice
1010
options: ["release", "beta", "alpha"]
11+
minecraft-versions:
12+
description: Overrides for supported versions
13+
required: false
14+
type: string
1115

1216
jobs:
1317
publish:
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: actions/checkout@v2
17-
- name: Set up JDK
18-
uses: actions/setup-java@v2
19-
with:
20-
java-version: '17'
21-
distribution: 'temurin'
22-
cache: 'gradle'
23-
24-
- name: Grant execute permission for gradlew
25-
run: chmod +x gradlew
26-
- name: Build with Gradle
27-
run: ./gradlew build
28-
29-
- name: Read mod version
30-
id: versions
31-
uses: christian-draeger/[email protected]
32-
with:
33-
path: gradle.properties
34-
properties: "mod_version minecraft_version"
35-
36-
- name: Read changelog
37-
uses: juliangruber/read-file-action@v1
38-
id: changelog
39-
with:
40-
path: "./changelog/${{ steps.versions.outputs.mod_version }}+${{ steps.versions.outputs.minecraft_version }}.md"
41-
42-
- name: Publish
43-
uses: Kir-Antipov/[email protected]
44-
with:
45-
name: "v${{ steps.versions.outputs.mod_version }} [${{ steps.versions.outputs.minecraft_version }}]"
46-
version: ${{ steps.versions.outputs.mod_version }}+mc.${{ steps.versions.outputs.minecraft_version }}
47-
version-type: ${{ inputs.version-type }}
48-
49-
loaders: fabric quilt
50-
java: 17 18
51-
52-
game-versions: ${{ steps.versions.outputs.minecraft_version }}
53-
changelog: ${{ steps.changelog.outputs.content }}
54-
55-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
56-
modrinth-id: b2SVO5sB
57-
modrinth-featured: false
58-
59-
github-token: ${{ secrets.GITHUB_TOKEN }}
60-
github-tag: ${{ steps.versions.outputs.mod_version }}+mc.${{ steps.versions.outputs.minecraft_version }}
18+
uses: MattiDragon/MattiDragon/.github/workflows/publish-mc-mod.yaml@00051ad2ae1350c882ab08a382d4dda38eff121b
19+
with:
20+
version-type: ${{ inputs.version-type }}
21+
minecraft-versions: ${{ inputs.minecraft-versions }}
22+
java-version: 21
23+
modrinth-id: b2SVO5sB
24+
jitpack-safe-version: true
25+
secrets:
26+
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
27+
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2023 MattiDragon
3+
Copyright (c) 2025 MattiDragon
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.4-SNAPSHOT'
3-
id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
2+
id 'fabric-loom' version '1.10-SNAPSHOT'
43
id 'maven-publish'
54
}
65

@@ -23,7 +22,7 @@ dependencies {
2322

2423
modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version"
2524

26-
modImplementation(include('me.lucko:fabric-permissions-api:0.2-SNAPSHOT'))
25+
modImplementation(include('me.lucko:fabric-permissions-api:0.3.1'))
2726
modImplementation(include("xyz.nucleoid:plasmid:$plasmid_version"))
2827
}
2928

@@ -47,8 +46,8 @@ tasks.withType(JavaCompile).configureEach {
4746
}
4847

4948
java {
50-
sourceCompatibility = JavaVersion.VERSION_17
51-
targetCompatibility = JavaVersion.VERSION_17
49+
sourceCompatibility = JavaVersion.VERSION_21
50+
targetCompatibility = JavaVersion.VERSION_21
5251

5352
withSourcesJar()
5453
}

changelog/1.0.0+1.20.4.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog/1.1.0+1.21.1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated to 1.21.1

gradle.properties

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
33

4-
minecraft_version=1.20.4
5-
yarn_mappings=1.20.4+build.3
6-
loader_version=0.15.2
4+
minecraft_version=1.21.1
5+
yarn_mappings=1.21.1+build.3
6+
loader_version=0.16.10
77

8-
mod_version=1.0.0
8+
mod_version=1.1.0
99
maven_group=io.github.mattidragon.demobox
1010
archives_base_name=DemoBox
1111

12-
fabric_version=0.91.2+1.20.4
13-
plasmid_version=0.5.102-SNAPSHOT+1.20.4
14-
mixinextras_version=0.2.0-beta.9
12+
fabric_version=0.115.1+1.21.1
13+
plasmid_version=0.6.3-SNAPSHOT+1.21.1

gradle/wrapper/gradle-wrapper.jar

-18.1 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,8 @@ done
8385
# This is normally unused
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8790

8891
# Use the maximum available, or set MAX_FD != -1 to use that value.
8992
MAX_FD=maximum
@@ -130,26 +133,29 @@ location of your Java installation."
130133
fi
131134
else
132135
JAVACMD=java
133-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136+
if ! command -v java >/dev/null 2>&1
137+
then
138+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134139
135140
Please set the JAVA_HOME variable in your environment to match the
136141
location of your Java installation."
142+
fi
137143
fi
138144

139145
# Increase the maximum file descriptors if we can.
140146
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
141147
case $MAX_FD in #(
142148
max*)
143149
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
144-
# shellcheck disable=SC3045
150+
# shellcheck disable=SC2039,SC3045
145151
MAX_FD=$( ulimit -H -n ) ||
146152
warn "Could not query maximum file descriptor limit"
147153
esac
148154
case $MAX_FD in #(
149155
'' | soft) :;; #(
150156
*)
151157
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
152-
# shellcheck disable=SC3045
158+
# shellcheck disable=SC2039,SC3045
153159
ulimit -n "$MAX_FD" ||
154160
warn "Could not set maximum file descriptor limit to $MAX_FD"
155161
esac
@@ -198,11 +204,11 @@ fi
198204
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200206

201-
# Collect all arguments for the java command;
202-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
203-
# shell script including quotes and variable substitutions, so put them in
204-
# double quotes to make sure that they get re-expanded; and
205-
# * put everything else in single quotes, so that it's not re-expanded.
207+
# Collect all arguments for the java command:
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209+
# and any embedded shellness will be escaped.
210+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211+
# treated as '${Hostname}' itself on the command line.
206212

207213
set -- \
208214
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)