diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index 11ceeaf..0000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build RMusic -on: - - push - - pull_request -jobs: - build: - strategy: - matrix: - java: - - 17 - os: - - ubuntu-latest - runs-on: ${{ matrix.os }} - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - name: Make Gradle wrapper executable - if: ${{ runner.os != 'Windows' }} - run: chmod +x ./gradlew - - name: Build - run: ./gradlew build - - name: Upload build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} - uses: actions/upload-artifact@v2 - with: - name: RMineCounter - path: build/libs/*.jar diff --git a/.gitignore b/.gitignore index 3c37caf..fb0d8f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,118 +1,4 @@ -# User-specific stuff -.idea/ - -*.iml -*.ipr -*.iws - -# IntelliJ -out/ -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -.gradle -build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Cache of project -.gradletasknamecache - -**/build/ - -# Common working directory -run/ - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar +/.idea +/build +/run +/.gradle \ No newline at end of file diff --git a/LICENSE b/LICENSE index 4b9f68b..989fa28 100644 --- a/LICENSE +++ b/LICENSE @@ -178,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a diff --git a/README.md b/README.md deleted file mode 100644 index 4137d20..0000000 --- a/README.md +++ /dev/null @@ -1,36 +0,0 @@ -
- -

RMineCounter

- -

在游戏中添加统计信息来统计玩家挖掘数据, 可以借助计分板显示出数据

- - - -
- -GitHub -GitHub Workflow Status -Kotlin Version -
- -# 依赖 - -* 由于使用了`Kotlin`语言所以你需要放置`fabric-language-kotlin`在你的mods文件夹内. 点击[这里](https://github.com/FabricMC/fabric-language-kotlin/releases/latest)快速下载最新版本的`fabric-language-kotlin` - -# 使用 - -* 默认是不会记录玩家挖掘数据的, 你需要添加一个计分板， 准则为`minecraft.custom:minecraft.rmc`的一个计分板, 以下为实例命令, 如有需要可以自行修改 - -* `/scoreboard objectives add rmc minecraft.custom:minecraft.rmc {"text":"挖掘榜", "color":"yellow"}` - -* 上面的命令执行完成后所有玩家破坏任何方块都会使其加1(常规情况下破坏方块), 使用以下命令来显示出计分板 - -* `/scoreboard objectives setdisplay sidebar rmc` - -* 你可以修改计分板的id和显示名称, 但是计分板的准则不能修改 - -# 开源 - -- 本项目以[Apache-2.0](./LICENSE)许可开源, 即: - - 你可以直接使用该项目提供的功能, 无需任何授权 - - 你可以在**注明来源版权信息**的情况下对源代码进行任意分发和修改以及衍生 diff --git a/build.gradle b/build.gradle index 43457cc..0c0c18e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,11 @@ group = project.maven_group repositories { mavenCentral() + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. } dependencies { @@ -19,7 +24,8 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation("net.fabricmc:fabric-language-kotlin:${project.fbktVer}") + modImplementation("net.fabricmc:fabric-language-kotlin:1.9.6+kotlin.1.8.22") + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } processResources { @@ -37,6 +43,10 @@ processResources { def targetJavaVersion = 17 tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { it.options.release = targetJavaVersion @@ -48,7 +58,10 @@ java { if (JavaVersion.current() < javaVersion) { toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) } - archivesBaseName = project.archives_base_name + "+fabric." + project.minecraft_version + archivesBaseName = project.archives_base_name + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. withSourcesJar() } @@ -58,3 +71,19 @@ jar { } } +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/gradle.properties b/gradle.properties index 89020c5..a900c6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,13 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 - loader_version=0.14.22 + loader_version=0.14.23 # Mod Properties - mod_version = 0.0.2 + mod_version = 0.1.0 maven_group = cn.rtast archives_base_name = RMC # Dependencies # check this on https://modmuss50.me/fabric.html - fabric_version=0.87.0+1.20.1 - -fbktVer=1.9.6+kotlin.1.8.22 + fabric_version=0.90.0+1.20.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index c1962a7..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..02f683e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip -networkTimeout=10000 -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100644 index aeb74cb..0000000 --- a/gradlew +++ /dev/null @@ -1,245 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/settings.gradle b/settings.gradle index 2875cde..f91a4fe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,4 +6,4 @@ pluginManagement { } gradlePluginPortal() } -} \ No newline at end of file +} diff --git a/src/main/java/cn/rtast/rminecounter/RMineCounter.kt b/src/main/java/cn/rtast/rmc/RMC.kt similarity index 52% rename from src/main/java/cn/rtast/rminecounter/RMineCounter.kt rename to src/main/java/cn/rtast/rmc/RMC.kt index 6339b33..8ac3aa2 100644 --- a/src/main/java/cn/rtast/rminecounter/RMineCounter.kt +++ b/src/main/java/cn/rtast/rmc/RMC.kt @@ -13,40 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.rtast.rminecounter -import cn.rtast.rminecounter.mixins.StatsAccessor +package cn.rtast.rmc + +import cn.rtast.rmc.mixin.StatsAccessor import com.google.common.collect.Sets -import net.fabricmc.api.ModInitializer -import net.minecraft.entity.player.PlayerEntity +import net.fabricmc.api.DedicatedServerModInitializer import net.minecraft.stat.Stat import net.minecraft.stat.StatFormatter import net.minecraft.util.Identifier +class RMC : DedicatedServerModInitializer { -object RMineCounter : ModInitializer { - private var RMC: Identifier? = null + companion object { + private val stats: MutableSet = Sets.newHashSet() - private val stats: MutableSet = Sets.newHashSet() + var RMC_STAT_ID: Identifier? = null - private fun addStat(stat: Identifier) { - stats.add(stat.toString()) + private fun addStat(stat: Identifier) { + stats.add(stat.toString()) + } + + fun registerStats() { + addStat(StatsAccessor.callRegister("rmc", StatFormatter.TIME).also { RMC_STAT_ID = it }) + } + + operator fun contains(stat: Stat<*>): Boolean { + return stats.contains(stat.value.toString()) + } } - fun registerStats() { - addStat(StatsAccessor.callRegister("rmc", StatFormatter.DEFAULT).also { RMC = it }) - } - - fun onPlayerMineFinish(player: PlayerEntity) { - player.increaseStat(RMC, 1) - } - - operator fun contains(stat: Stat<*>): Boolean { - return stats.contains(stat.value.toString()) - } - - override fun onInitialize() { + override fun onInitializeServer() { println("RMC 已加载!") } } \ No newline at end of file diff --git a/src/main/java/cn/rtast/rminecounter/mixins/BlockMixin.java b/src/main/java/cn/rtast/rmc/mixin/BlockMixin.java similarity index 86% rename from src/main/java/cn/rtast/rminecounter/mixins/BlockMixin.java rename to src/main/java/cn/rtast/rmc/mixin/BlockMixin.java index 47e815f..cb30f47 100644 --- a/src/main/java/cn/rtast/rminecounter/mixins/BlockMixin.java +++ b/src/main/java/cn/rtast/rmc/mixin/BlockMixin.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.rtast.rminecounter.mixins; +package cn.rtast.rmc.mixin; -import cn.rtast.rminecounter.RMineCounter; +import cn.rtast.rmc.RMC; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -29,11 +29,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Block.class) public class BlockMixin { - @Inject(method = "onBreak", at = @At("HEAD")) public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfo ci) { -// BlockListener.INSTANCE.onBreak(player); - RMineCounter.INSTANCE.onPlayerMineFinish(player); + player.increaseStat(RMC.Companion.getRMC_STAT_ID(), 1); } - } diff --git a/src/main/java/cn/rtast/rminecounter/mixins/ServerStatHandlerMixin.java b/src/main/java/cn/rtast/rmc/mixin/ServerStatHandlerMixin.java similarity index 90% rename from src/main/java/cn/rtast/rminecounter/mixins/ServerStatHandlerMixin.java rename to src/main/java/cn/rtast/rmc/mixin/ServerStatHandlerMixin.java index ce856a5..3ec1420 100644 --- a/src/main/java/cn/rtast/rminecounter/mixins/ServerStatHandlerMixin.java +++ b/src/main/java/cn/rtast/rmc/mixin/ServerStatHandlerMixin.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package cn.rtast.rminecounter.mixins; +package cn.rtast.rmc.mixin; -import cn.rtast.rminecounter.RMineCounter; +import cn.rtast.rmc.RMC; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.stat.ServerStatHandler; @@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; public abstract class ServerStatHandlerMixin { @Redirect(method = "sendStats", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/Object2IntMap;put(Ljava/lang/Object;I)I"), remap = false) private int excludeCustomStats(Object2IntMap> map, Object object, int value, ServerPlayerEntity player) { - if (!RMineCounter.INSTANCE.contains((Stat) object)) { + if (!RMC.Companion.contains((Stat) object)) { return map.put((Stat) object, value); } else { return map.defaultReturnValue(); diff --git a/src/main/java/cn/rtast/rminecounter/mixins/StatsAccessor.java b/src/main/java/cn/rtast/rmc/mixin/StatsAccessor.java similarity index 96% rename from src/main/java/cn/rtast/rminecounter/mixins/StatsAccessor.java rename to src/main/java/cn/rtast/rmc/mixin/StatsAccessor.java index 9ab63a9..582aada 100644 --- a/src/main/java/cn/rtast/rminecounter/mixins/StatsAccessor.java +++ b/src/main/java/cn/rtast/rmc/mixin/StatsAccessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cn.rtast.rminecounter.mixins; +package cn.rtast.rmc.mixin; import net.minecraft.registry.Registry; import net.minecraft.stat.StatFormatter; @@ -35,4 +35,4 @@ public interface StatsAccessor { static StatType callRegisterType(String string, Registry registry) { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/cn/rtast/rminecounter/mixins/StatsMixin.java b/src/main/java/cn/rtast/rmc/mixin/StatsMixin.java similarity index 85% rename from src/main/java/cn/rtast/rminecounter/mixins/StatsMixin.java rename to src/main/java/cn/rtast/rmc/mixin/StatsMixin.java index e714b15..bb9dfb3 100644 --- a/src/main/java/cn/rtast/rminecounter/mixins/StatsMixin.java +++ b/src/main/java/cn/rtast/rmc/mixin/StatsMixin.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package cn.rtast.rminecounter.mixins; +package cn.rtast.rmc.mixin; - -import cn.rtast.rminecounter.RMineCounter; +import cn.rtast.rmc.RMC; import net.minecraft.stat.Stats; import org.spongepowered.asm.mixin.Mixin; @@ -25,6 +24,6 @@ import org.spongepowered.asm.mixin.Mixin; public class StatsMixin { static { - RMineCounter.INSTANCE.registerStats(); + RMC.Companion.registerStats(); } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/rmc/icon.png b/src/main/resources/assets/rmc/icon.png new file mode 100644 index 0000000..1359d4b Binary files /dev/null and b/src/main/resources/assets/rmc/icon.png differ diff --git a/src/main/resources/assets/rmc/lang/en_us.json b/src/main/resources/assets/rmc/lang/en_us.json new file mode 100644 index 0000000..fcad059 --- /dev/null +++ b/src/main/resources/assets/rmc/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "stat.rmc.rmc_stat": "挖掘数" +} \ No newline at end of file diff --git a/src/main/resources/assets/rmc/lang/zh_cn.json b/src/main/resources/assets/rmc/lang/zh_cn.json new file mode 100644 index 0000000..6dc0d22 --- /dev/null +++ b/src/main/resources/assets/rmc/lang/zh_cn.json @@ -0,0 +1,3 @@ +{ + "stat.rmc.rmc_stat": "Total number of blocks destroyed." +} \ No newline at end of file diff --git a/src/main/resources/assets/rminecounter/icon.png b/src/main/resources/assets/rminecounter/icon.png deleted file mode 100644 index ac9df0d..0000000 Binary files a/src/main/resources/assets/rminecounter/icon.png and /dev/null differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1ff5af3..1f9ef94 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,28 +1,29 @@ { "schemaVersion": 1, - "id": "rminecounter", + "id": "rmc", "version": "${version}", - "name": "RMineCounter", + "name": "RMC", "description": "添加挖掘榜", "authors": [ "RTAkland" ], "contact": { - "repo": "https://github.com/RTAkland/RMineCounter" + "website": "https://github.com/DangoTown/RMC", + "repo": "https://github.com/DangoTown/RMC" }, "license": "Apache-2.0", - "icon": "assets/rminecounter/icon.png", - "environment": "*", + "icon": "assets/rmc/icon.png", + "environment": "server", "entrypoints": { - "main": [ + "server": [ { "adapter": "kotlin", - "value": "cn.rtast.rminecounter.RMineCounter" + "value": "cn.rtast.rmc.RMC" } ] }, "mixins": [ - "rminecounter.mixins.json" + "rmc.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}", diff --git a/src/main/resources/rminecounter.mixins.json b/src/main/resources/rmc.mixins.json similarity index 74% rename from src/main/resources/rminecounter.mixins.json rename to src/main/resources/rmc.mixins.json index f8e7cb4..7fc95c9 100644 --- a/src/main/resources/rminecounter.mixins.json +++ b/src/main/resources/rmc.mixins.json @@ -1,11 +1,10 @@ { "required": true, "minVersion": "0.8", - "package": "cn.rtast.rminecounter.mixins", + "package": "cn.rtast.rmc.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ "BlockMixin", - "ServerPlayNetworkHandlerAccessor", "ServerStatHandlerMixin", "StatsAccessor", "StatsMixin"