Skip to content

Commit 3f1d657

Browse files
authored
Ported to 1.20.1 by R4z0rX
2 parents 3e5def2 + baad9d7 commit 3f1d657

File tree

12 files changed

+441
-52
lines changed

12 files changed

+441
-52
lines changed

.github/workflows/build.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Automatically build the project and run any configured tests for every push
2+
# and submitted pull request. This can help catch issues that only occur on
3+
# certain platforms or Java versions, and provides a first line of defence
4+
# against bad commits.
5+
6+
name: build
7+
on: [pull_request, push]
8+
9+
jobs:
10+
build:
11+
strategy:
12+
matrix:
13+
# Use these Java versions
14+
java: [
15+
17 # Current Java LTS & minimum supported by Minecraft
16+
]
17+
# and run on both Linux and Windows
18+
os: [ubuntu-22.04, windows-2022]
19+
runs-on: ${{ matrix.os }}
20+
steps:
21+
- name: checkout repository
22+
uses: actions/checkout@v3
23+
- name: validate gradle wrapper
24+
uses: gradle/wrapper-validation-action@v1
25+
- name: setup jdk ${{ matrix.java }}
26+
uses: actions/setup-java@v3
27+
with:
28+
java-version: ${{ matrix.java }}
29+
distribution: 'microsoft'
30+
- name: make gradle wrapper executable
31+
if: ${{ runner.os != 'Windows' }}
32+
run: chmod +x ./gradlew
33+
- name: build
34+
run: ./gradlew build
35+
- name: capture build artifacts
36+
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
37+
uses: actions/upload-artifact@v3
38+
with:
39+
name: Artifacts
40+
path: build/libs/

build.gradle

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
plugins {
2-
id 'fabric-loom' version '0.12-SNAPSHOT'
2+
id 'fabric-loom' version '1.3-SNAPSHOT'
33
id 'maven-publish'
44
}
55

66
version = project.mod_version
77
group = project.maven_group
88

9+
base {
10+
archivesName = project.archives_base_name
11+
}
12+
913
repositories {
1014
// Add repositories to retrieve artifacts from in here.
1115
// You should only use this when depending on other mods because
@@ -26,40 +30,30 @@ dependencies {
2630

2731
processResources {
2832
inputs.property "version", project.version
29-
filteringCharset "UTF-8"
3033

3134
filesMatching("fabric.mod.json") {
3235
expand "version": project.version
3336
}
3437
}
3538

36-
def targetJavaVersion = 17
3739
tasks.withType(JavaCompile).configureEach {
38-
// ensure that the encoding is set to UTF-8, no matter what the system default is
39-
// this fixes some edge cases with special characters not displaying correctly
40-
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
41-
// If Javadoc is generated, this must be specified in that task too.
42-
it.options.encoding = "UTF-8"
43-
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
44-
it.options.release = targetJavaVersion
45-
}
40+
//it.options.release = 17
41+
it.options.getRelease().set(17)
4642
}
4743

4844
java {
49-
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
50-
if (JavaVersion.current() < javaVersion) {
51-
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
52-
}
53-
archivesBaseName = project.archives_base_name
5445
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
5546
// if it is present.
5647
// If you remove this line, sources will not be generated.
5748
withSourcesJar()
49+
50+
sourceCompatibility = JavaVersion.VERSION_17
51+
targetCompatibility = JavaVersion.VERSION_17
5852
}
5953

6054
jar {
6155
from("LICENSE") {
62-
rename { "${it}_${project.archivesBaseName}" }
56+
rename { "${it}_${project.base.archivesName.get()}"}
6357
}
6458
}
6559

gradle.properties

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
3+
org.gradle.parallel=true
4+
35
# Fabric Properties
4-
# check these on https://modmuss50.me/fabric.html
5-
minecraft_version=1.18
6-
yarn_mappings=1.18+build.1
7-
loader_version=0.14.8
6+
# check these on https://fabricmc.net/develop
7+
minecraft_version=1.20.1
8+
yarn_mappings=1.20.1+build.10
9+
loader_version=0.14.21
10+
811
# Mod Properties
9-
mod_version=1.1.2
12+
mod_version=1.2.0
1013
maven_group=fokuso
1114
archives_base_name=fokuso
15+
1216
# Dependencies
13-
# check this on https://modmuss50.me/fabric.html
14-
fabric_version=0.44.0+1.18
17+
fabric_version=0.86.1+1.20.1

gradle/wrapper/gradle-wrapper.jar

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

gradlew

Lines changed: 248 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,248 @@
1+
#!/bin/sh
2+
3+
#
4+
# Copyright © 2015-2021 the original authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (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
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
63+
##############################################################################
64+
65+
# Attempt to set APP_HOME
66+
67+
# Resolve links: $0 may be a link
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73+
[ -h "$app_path" ]
74+
do
75+
ls=$( ls -ld "$app_path" )
76+
link=${ls#*' -> '}
77+
case $link in #(
78+
/*) app_path=$link ;; #(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
81+
done
82+
83+
# This is normally unused
84+
# shellcheck disable=SC2034
85+
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87+
88+
# Use the maximum available, or set MAX_FD != -1 to use that value.
89+
MAX_FD=maximum
90+
91+
warn () {
92+
echo "$*"
93+
} >&2
94+
95+
die () {
96+
echo
97+
echo "$*"
98+
echo
99+
exit 1
100+
} >&2
101+
102+
# OS specific support (must be 'true' or 'false').
103+
cygwin=false
104+
msys=false
105+
darwin=false
106+
nonstop=false
107+
case "$( uname )" in #(
108+
CYGWIN* ) cygwin=true ;; #(
109+
Darwin* ) darwin=true ;; #(
110+
MSYS* | MINGW* ) msys=true ;; #(
111+
NONSTOP* ) nonstop=true ;;
112+
esac
113+
114+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
115+
116+
117+
# Determine the Java command to use to start the JVM.
118+
if [ -n "$JAVA_HOME" ] ; then
119+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
120+
# IBM's JDK on AIX uses strange locations for the executables
121+
JAVACMD=$JAVA_HOME/jre/sh/java
122+
else
123+
JAVACMD=$JAVA_HOME/bin/java
124+
fi
125+
if [ ! -x "$JAVACMD" ] ; then
126+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
127+
128+
Please set the JAVA_HOME variable in your environment to match the
129+
location of your Java installation."
130+
fi
131+
else
132+
JAVACMD=java
133+
if ! command -v java >/dev/null 2>&1
134+
then
135+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136+
137+
Please set the JAVA_HOME variable in your environment to match the
138+
location of your Java installation."
139+
fi
140+
fi
141+
142+
# Increase the maximum file descriptors if we can.
143+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144+
case $MAX_FD in #(
145+
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
148+
MAX_FD=$( ulimit -H -n ) ||
149+
warn "Could not query maximum file descriptor limit"
150+
esac
151+
case $MAX_FD in #(
152+
'' | soft) :;; #(
153+
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
156+
ulimit -n "$MAX_FD" ||
157+
warn "Could not set maximum file descriptor limit to $MAX_FD"
158+
esac
159+
fi
160+
161+
# Collect all arguments for the java command, stacking in reverse order:
162+
# * args from the command line
163+
# * the main class name
164+
# * -classpath
165+
# * -D...appname settings
166+
# * --module-path (only if needed)
167+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
168+
169+
# For Cygwin or MSYS, switch paths to Windows format before running java
170+
if "$cygwin" || "$msys" ; then
171+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
172+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
173+
174+
JAVACMD=$( cygpath --unix "$JAVACMD" )
175+
176+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
177+
for arg do
178+
if
179+
case $arg in #(
180+
-*) false ;; # don't mess with options #(
181+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
182+
[ -e "$t" ] ;; #(
183+
*) false ;;
184+
esac
185+
then
186+
arg=$( cygpath --path --ignore --mixed "$arg" )
187+
fi
188+
# Roll the args list around exactly as many times as the number of
189+
# args, so each arg winds up back in the position where it started, but
190+
# possibly modified.
191+
#
192+
# NB: a `for` loop captures its iteration list before it begins, so
193+
# changing the positional parameters here affects neither the number of
194+
# iterations, nor the values presented in `arg`.
195+
shift # remove old arg
196+
set -- "$@" "$arg" # push replacement arg
197+
done
198+
fi
199+
200+
201+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203+
204+
# Collect all arguments for the java command;
205+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206+
# shell script including quotes and variable substitutions, so put them in
207+
# double quotes to make sure that they get re-expanded; and
208+
# * put everything else in single quotes, so that it's not re-expanded.
209+
210+
set -- \
211+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
212+
-classpath "$CLASSPATH" \
213+
org.gradle.wrapper.GradleWrapperMain \
214+
"$@"
215+
216+
# Stop when "xargs" is not available.
217+
if ! command -v xargs >/dev/null 2>&1
218+
then
219+
die "xargs is not available"
220+
fi
221+
222+
# Use "xargs" to parse quoted args.
223+
#
224+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
225+
#
226+
# In Bash we could simply go:
227+
#
228+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
229+
# set -- "${ARGS[@]}" "$@"
230+
#
231+
# but POSIX shell has neither arrays nor command substitution, so instead we
232+
# post-process each arg (as a line of input to sed) to backslash-escape any
233+
# character that might be a shell metacharacter, then use eval to reverse
234+
# that process (while maintaining the separation between arguments), and wrap
235+
# the whole thing up as a single "set" statement.
236+
#
237+
# This will of course break if any of these variables contains a newline or
238+
# an unmatched quote.
239+
#
240+
241+
eval "set -- $(
242+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
243+
xargs -n1 |
244+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
245+
tr '\n' ' '
246+
)" '"$@"'
247+
248+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)