Skip to content

Commit fe1b75d

Browse files
NKID00NKID00
committed
refactor: update deps & rename package
1 parent 970a61f commit fe1b75d

File tree

83 files changed

+319
-305
lines changed

Some content is hidden

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

83 files changed

+319
-305
lines changed

‎build.gradle.kts‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
22
`java-library`
3-
id("fabric-loom") version "1.6-SNAPSHOT"
3+
id("fabric-loom") version "1.11-SNAPSHOT"
44
id("maven-publish")
5-
id("com.github.johnrengelman.shadow") version "8.1.1"
6-
id("org.jetbrains.kotlin.jvm") version "1.9.23"
5+
id("com.gradleup.shadow") version "9.0.2"
6+
kotlin("jvm") version "2.2.10"
77
}
88

99
fun buildMetadata(): String {
@@ -20,7 +20,7 @@ base {
2020
}
2121

2222
loom {
23-
accessWidenerPath = file("src/main/resources/rcutil.accesswidener")
23+
accessWidenerPath = file("src/main/resources/rcu.accesswidener")
2424
}
2525

2626
tasks.withType<AbstractArchiveTask> {
@@ -63,11 +63,11 @@ tasks.processResources {
6363
}
6464

6565
tasks.withType<JavaCompile>().configureEach {
66-
options.release = 17
66+
options.release = 21
6767
}
6868

6969
java {
70-
sourceCompatibility = JavaVersion.VERSION_17
70+
sourceCompatibility = JavaVersion.VERSION_21
7171
targetCompatibility = JavaVersion.VERSION_17
7272
}
7373

@@ -94,16 +94,16 @@ tasks.remapJar {
9494
}
9595

9696
// extract I18n keys
97-
task("extract") {
98-
doLast {
99-
exec {
100-
workingDir(layout.buildDirectory)
101-
executable("bash")
102-
args(
103-
"-c",
104-
"find ${projectDir}/src/main/java/ -iname \"*.java\"" +
105-
" | xargs xgettext -kI18n.t:1 -kI18n.t:2 -kI18n.overlay:2" +
106-
" -kI18n.overlayError:2 -kI18n.send:2 -kI18n.sendError:2")
107-
}
108-
}
109-
}
97+
// task("extract") {
98+
// doLast {
99+
// exec {
100+
// workingDir(layout.buildDirectory)
101+
// executable("bash")
102+
// args(
103+
// "-c",
104+
// "find ${projectDir}/src/main/java/ -iname \"*.java\"" +
105+
// " | xargs xgettext -kI18n.t:1 -kI18n.t:2 -kI18n.overlay:2" +
106+
// " -kI18n.overlayError:2 -kI18n.send:2 -kI18n.sendError:2")
107+
// }
108+
// }
109+
// }

‎gradle.properties‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx4G
33
org.gradle.parallel=true
4-
# Fabric Properties
5-
# check these on https://fabricmc.net/develop
6-
minecraft_version=1.19.4
7-
yarn_mappings=1.19.4+build.2
8-
loader_version=0.15.10
9-
fabric_kotlin_version=1.10.19+kotlin.1.9.23
104
# Mod Properties
115
mod_version=0.3.0.a2
126
compatible_mc_version=1.20.1
137
detailed_mc_version=>=1.20.1
14-
maven_group=name.nkid00
15-
archives_name=redstone-computer-utilities
8+
maven_group=me.nk0
9+
archives_name=redstone-comp-util
1610
# Dependencies
11+
# check fabric on https://fabricmc.net/develop
12+
minecraft_version=1.19.4
13+
yarn_mappings=1.19.4+build.2
14+
loader_version=0.17.2
15+
fabric_kotlin_version=1.13.5+kotlin.2.2.10
1716
fabric_version=0.87.2+1.19.4
1817
gson_version=2.10
1918
guava_version=31.1-jre

‎gradle/wrapper/gradle-wrapper.jar‎

-17.9 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

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.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 18 additions & 12 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
@@ -111,7 +114,7 @@ case "$( uname )" in #(
111114
NONSTOP* ) nonstop=true ;;
112115
esac
113116

114-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
115118

116119

117120
# Determine the Java command to use to start the JVM.
@@ -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,16 +204,16 @@ 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, 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" \
209215
-classpath "$CLASSPATH" \
210-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
211217
"$@"
212218

213219
# Stop when "xargs" is not available.

‎gradlew.bat‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

6870
:execute
6971
@rem Setup the command line
7072

71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7274

7375

7476
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7678

7779
:end
7880
@rem End local scope for the variables with windows NT shell

‎src/main/java/name/nkid00/rcutil/RCUtil.java‎ renamed to ‎src/main/java/me/nk0/rcu/Main.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package name.nkid00.rcutil;
2-
3-
import name.nkid00.rcutil.helper.GsonHelper;
4-
import name.nkid00.rcutil.helper.WorldHelper;
5-
import name.nkid00.rcutil.manager.CommandManager;
6-
import name.nkid00.rcutil.manager.GametimeManager;
7-
import name.nkid00.rcutil.manager.StorageManager;
8-
import name.nkid00.rcutil.manager.WandManager;
9-
import name.nkid00.rcutil.server.ApiServer;
1+
package me.nk0.rcu;
2+
3+
import me.nk0.rcu.helper.GsonHelper;
4+
import me.nk0.rcu.helper.WorldHelper;
5+
import me.nk0.rcu.manager.CommandManager;
6+
import me.nk0.rcu.manager.GametimeManager;
7+
import me.nk0.rcu.manager.StorageManager;
8+
import me.nk0.rcu.manager.WandManager;
9+
import me.nk0.rcu.server.ApiServer;
1010
import net.fabricmc.api.EnvType;
1111
import net.fabricmc.api.ModInitializer;
1212
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@@ -16,7 +16,7 @@
1616
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
1717
import net.fabricmc.loader.api.FabricLoader;
1818

19-
public class RCUtil implements ModInitializer {
19+
public class Main implements ModInitializer {
2020
public static boolean isDedicatedServer = false;
2121

2222
@Override

‎src/main/java/name/nkid00/rcutil/Options.java‎ renamed to ‎src/main/java/me/nk0/rcu/Options.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package name.nkid00.rcutil;
1+
package me.nk0.rcu;
22

33
import java.io.File;
44
import java.io.FileReader;
@@ -10,8 +10,8 @@
1010
import com.google.gson.JsonParseException;
1111
import com.google.gson.annotations.Expose;
1212

13-
import name.nkid00.rcutil.helper.GsonHelper;
14-
import name.nkid00.rcutil.helper.Log;
13+
import me.nk0.rcu.helper.GsonHelper;
14+
import me.nk0.rcu.helper.Log;
1515
import net.fabricmc.loader.api.FabricLoader;
1616
import net.minecraft.item.Item;
1717
import net.minecraft.item.ItemStack;

‎src/main/java/name/nkid00/rcutil/adapter/BitSetAdapter.java‎ renamed to ‎src/main/java/me/nk0/rcu/adapter/BitSetAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package name.nkid00.rcutil.adapter;
1+
package me.nk0.rcu.adapter;
22

33
import java.io.IOException;
44
import java.util.BitSet;
@@ -8,7 +8,7 @@
88
import com.google.gson.stream.JsonToken;
99
import com.google.gson.stream.JsonWriter;
1010

11-
import name.nkid00.rcutil.helper.BitSetHelper;
11+
import me.nk0.rcu.helper.BitSetHelper;
1212

1313
public class BitSetAdapter extends TypeAdapter<BitSet> {
1414
@Override

‎src/main/java/name/nkid00/rcutil/adapter/BlockPosAdapter.java‎ renamed to ‎src/main/java/me/nk0/rcu/adapter/BlockPosAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package name.nkid00.rcutil.adapter;
1+
package me.nk0.rcu.adapter;
22

33
import java.io.IOException;
44

@@ -7,7 +7,7 @@
77
import com.google.gson.stream.JsonToken;
88
import com.google.gson.stream.JsonWriter;
99

10-
import name.nkid00.rcutil.helper.PosHelper;
10+
import me.nk0.rcu.helper.PosHelper;
1111
import net.minecraft.util.math.BlockPos;
1212

1313
public class BlockPosAdapter extends TypeAdapter<BlockPos> {

0 commit comments

Comments
 (0)