diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb361df..b01da52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,8 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + name: build on: [pull_request, push] @@ -7,28 +12,26 @@ jobs: matrix: # Use these Java versions java: [ - 17, # Current Java LTS & minimum supported by Minecraft + 21, # Current Java LTS ] - # and run on both Linux and Windows - os: [ubuntu-20.04, windows-2022] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-22.04 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 + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v2 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} - - name: Make gradle wrapper executable - if: ${{ runner.os != 'Windows' }} + distribution: 'microsoft' + - name: make gradle wrapper executable run: chmod +x ./gradlew - - name: Build + - name: build run: ./gradlew build - - name: Capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} - uses: actions/upload-artifact@v2 + - name: capture build artifacts + if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + uses: actions/upload-artifact@v4 with: name: Artifacts - path: build/libs/ + path: build/libs/ \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 11a2d61..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,28 +0,0 @@ -on: - release: - types: [published] - -name: Create Release - -jobs: - release: - name: Upload Release Asset - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup java - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Build project - run: | - chmod +x ./gradlew - ./gradlew build - - name: Publish mod - uses: Kir-Antipov/mc-publish@v2.1 - with: - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - github-token: ${{ secrets.GITHUB_TOKEN }} - - loader: fabric diff --git a/.gitignore b/.gitignore index 09cd281..c476faf 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,10 @@ bin/ # fabric run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE index 7283ef3..1625c17 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,121 @@ -MIT License - -Copyright (c) 2022 Carpet MCT Addition contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2436883..d61e169 100644 --- a/build.gradle +++ b/build.gradle @@ -1,81 +1,93 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' - id 'maven-publish' + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'maven-publish' } -repositories { - maven { url 'https://masa.dy.fi/maven' } - maven { url 'https://jitpack.io' } -} - -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 - -archivesBaseName = project.archives_base_name -version = project.minecraft_version+'-'+project.mod_version +version = project.mod_version group = project.maven_group -loom { - accessWidenerPath = file("src/main/resources/cma.accesswidener") +base { + archivesName = project.archives_base_name } -dependencies { - //to change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" +repositories { + // Add repositories to retrieve artifacts from in here. + maven { + url = "https://maven.fabricmc.net/" + } + maven { + url = "https://maven.curseforge.com/" + } + maven { + url = "https://maven.modrinth.com/" + } + maven { url 'https://jitpack.io' } + mavenCentral() +} - modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}" +loom { + splitEnvironmentSourceSets() - modCompileOnly "com.github.CaffeineMC.lithium-fabric:lithium:mc1.18.2-0.7.9" + mods { + "modid" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } +} - modRuntimeOnly "com.github.astei:lazydfu:0.1.2" +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "com.github.gnembon:fabric-carpet:${project.carpet_core_version}" + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" } processResources { - inputs.property "version", project.version + inputs.property "version", project.version - filesMatching("fabric.mod.json") { - expand "version": project.mod_version - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } } -// 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 -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - it.options.release = 17 +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 } java { - // 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() + // 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() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { - from "LICENSE" + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}" } + } } // configure the maven publication publishing { - publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(jar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } - } - } + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } - // select the repositories you want to publish to - repositories { - // uncomment to publish to the local maven - // mavenLocal() - } -} + // 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. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 15d31c4..3d8d1fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,16 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G - +org.gradle.jvmargs=-Xmx6G # Fabric Properties - # check these on https://fabricmc.net/use or https://modmuss50.me/fabric.html - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.3 - loader_version=0.13.3 - # check available versions on maven for the given minecraft version you are using - carpet_core_version=1.4.69+v220331 - +# check these on https://fabricmc.net/use or https://modmuss50.me/fabric.html +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.16.5 +# check available versions on maven for the given minecraft version you are using +carpet_core_version=v1.14.4-thunder # Mod Properties - mod_version=0.1.1 - maven_group=tech.mctown.cma - archives_base_name=carpet-mct-addition - +mod_version=0.1.1 +maven_group=tech.mctown.cma +archives_base_name=carpet-mct-addition # Dependencies - # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric - fabric_version=0.51.1+1.18.2 +# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric +fabric_version=0.104.0+1.21.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ 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. + if ! command -v java >/dev/null 2>&1 + then + 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 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=SC2039,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=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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. + +# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,94 @@ -@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=. -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%" == "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%"=="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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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/java/tech/mctown/cma/CMAEntry.java b/java/tech/mctown/cma/CMAEntry.java new file mode 100644 index 0000000..11d8a5a --- /dev/null +++ b/java/tech/mctown/cma/CMAEntry.java @@ -0,0 +1,11 @@ +package tech.mctown.cma; + +import carpet.CarpetServer; +import net.fabricmc.api.ModInitializer; + +public class CMAEntry implements ModInitializer { + @Override + public void onInitialize() { + CarpetServer.manageExtension(CMAExtension.INSTANCE); + } +} diff --git a/java/tech/mctown/cma/CMAExtension.java b/java/tech/mctown/cma/CMAExtension.java new file mode 100644 index 0000000..4a58f33 --- /dev/null +++ b/java/tech/mctown/cma/CMAExtension.java @@ -0,0 +1,30 @@ +package tech.mctown.cma; + +import carpet.CarpetExtension; +import carpet.CarpetServer; +import com.mojang.brigadier.CommandDispatcher; +import net.minecraft.server.command.ServerCommandSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import tech.mctown.cma.commands.DumpEntityCommand; + +public class CMAExtension implements CarpetExtension { + public static final CMAExtension INSTANCE = new CMAExtension(); + public static final String MODID = "CMA"; + public static final Logger LOGGER = LoggerFactory.getLogger(MODID); + + @Override + public String version() { + return MODID; + } + + @Override + public void onGameStarted() { + CarpetServer.settingsManager.parseSettingsClass(CMASettings.class); + } + + @Override + public void registerCommands(CommandDispatcher dispatcher) { + DumpEntityCommand.registerCommand(dispatcher); + } +} diff --git a/java/tech/mctown/cma/CMASettings.java b/java/tech/mctown/cma/CMASettings.java new file mode 100644 index 0000000..03ace2e --- /dev/null +++ b/java/tech/mctown/cma/CMASettings.java @@ -0,0 +1,45 @@ +package tech.mctown.cma; + +import carpet.settings.Rule; + +import java.lang.annotation.Target; + +import static carpet.settings.RuleCategory.*; + +public class CMASettings { + static final String CMA = CMAExtension.MODID; + + @Rule( + desc = "Execute the command on the sign if it's right-clicked by player who is not sneaking nor holding " + + "anything in the main hand.", + extra = {"Texts must start with '/'."}, + category = {CMA, SURVIVAL} + ) + public static boolean runCommandOnSign = false; + + @Rule( + desc = "Player can edit the sign when it's right-clicked if the player is sneaking and not holding anything " + + "in the main hand.", + category = {CMA, SURVIVAL} + ) + public static boolean editableSign = false; + + @Rule( + desc = "Observer will be activied when player uses Flint and Steel on it.", + extra = {"Sneak to light fire on observers."}, + category = {CMA, CREATIVE} + ) + public static boolean flintAndSteelActivatesObserver = false; + + @Rule( + desc = "Enable the usage of /dumpentity", + category = {CMA, CREATIVE, COMMAND} + ) + public static String commandDumpEntity = "true"; + + @Rule( + desc = "Op players can spawn bots in different gamemodes.", + category = {CMA, SURVIVAL} + ) + public static boolean fakePlayerGamemode = true; +} diff --git a/java/tech/mctown/cma/commands/DumpEntityCommand.java b/java/tech/mctown/cma/commands/DumpEntityCommand.java new file mode 100644 index 0000000..4d5ca2e --- /dev/null +++ b/java/tech/mctown/cma/commands/DumpEntityCommand.java @@ -0,0 +1,31 @@ +package tech.mctown.cma.commands; + +import carpet.settings.SettingsManager; +import carpet.utils.Messenger; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.context.CommandContext; +import net.minecraft.entity.Entity; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.Text; +import tech.mctown.cma.CMASettings; + +import static net.minecraft.server.command.CommandManager.literal; + +public class DumpEntityCommand { + public static void registerCommand(CommandDispatcher dispatcher) { + dispatcher.register( + literal("dumpentity").requires(src -> SettingsManager.canUseCommand(src, CMASettings.commandDumpEntity)) + .executes(DumpEntityCommand::dumpEntity) + ); + } + + public static int dumpEntity(CommandContext ctx) { + ServerCommandSource src = ctx.getSource(); + ServerWorld world = src.getWorld(); + for (Entity e : world.iterateEntities()) { + Messenger.m(src, Text.of(e.toString())); + } + return 0; + } +} diff --git a/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java b/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java new file mode 100644 index 0000000..6d5d7ec --- /dev/null +++ b/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java @@ -0,0 +1,25 @@ +package tech.mctown.cma.mixins.editableSign; + +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import tech.mctown.cma.CMASettings; + +@Mixin(SignBlockEntity.class) +public abstract class SignBlockEntityMixin { + @Shadow + abstract public void setEditable(boolean editable); + + @Inject(method = "onActivate", at = @At("HEAD")) + public void editSign(ServerPlayerEntity player, CallbackInfoReturnable ci) { + if (CMASettings.editableSign && player.getAbilities().allowModifyWorld && player.getMainHandStack().isOf(Items.AIR) && player.isSneaking()) { + this.setEditable(true); + player.openEditSignScreen((SignBlockEntity) (Object) this); + } + } +} diff --git a/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java b/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java new file mode 100644 index 0000000..bb630a3 --- /dev/null +++ b/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java @@ -0,0 +1,28 @@ +package tech.mctown.cma.mixins.fakePlayerGamemode; + +import carpet.commands.PlayerCommand; +import carpet.utils.Messenger; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import net.minecraft.server.command.ServerCommandSource; +import tech.mctown.cma.CMASettings; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PlayerCommand.class) +public abstract class PlayerCommandMixin { + @Inject(method = "cantSpawn", at = @At("HEAD"), remap = false) + static private void checkGamemode(CommandContext context, CallbackInfoReturnable ci) { + try { + StringArgumentType.getString(context, "gamemode"); + } catch (IllegalArgumentException e) { + return; + } + if (!CMASettings.fakePlayerGamemode) { + ci.setReturnValue(true); + } + } +} diff --git a/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java b/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java new file mode 100644 index 0000000..98363e6 --- /dev/null +++ b/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java @@ -0,0 +1,36 @@ +package tech.mctown.cma.mixins.flintAndSteelActivatesObserver; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.ObserverBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.FlintAndSteelItem; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import tech.mctown.cma.CMASettings; + +@Mixin(FlintAndSteelItem.class) +public abstract class FlintAndSteelItemMixin { + @Inject(method = "useOnBlock", at = @At("HEAD"), cancellable = true) + void activatesObserver(ItemUsageContext context, CallbackInfoReturnable ci) { + if (CMASettings.flintAndSteelActivatesObserver) { + PlayerEntity playerEntity = context.getPlayer(); + if (playerEntity == null) return; + World world = context.getWorld(); + BlockPos blockPos = context.getBlockPos(); + BlockState blockState = world.getBlockState(blockPos); + + if (blockState.isOf(Blocks.OBSERVER) && !playerEntity.isSneaking()) { + ObserverBlock observer = (ObserverBlock) blockState.getBlock(); + observer.scheduleTick(world, blockPos); + ci.setReturnValue(ActionResult.success(world.isClient())); + } + } + } +} diff --git a/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java b/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java new file mode 100644 index 0000000..e418133 --- /dev/null +++ b/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java @@ -0,0 +1,37 @@ +package tech.mctown.cma.mixins.runCommandOnSign; + +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.item.Items; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import tech.mctown.cma.CMASettings; + +@Mixin(SignBlockEntity.class) +public abstract class SignBlockEntityMixin { + @Shadow + protected abstract Text[] getTexts(boolean filtered); + + @Inject(method = "onActivate", at = @At("HEAD")) + public void runCommandOnActivated(ServerPlayerEntity player, CallbackInfoReturnable ci) { + if (CMASettings.runCommandOnSign) { + Text[] texts = this.getTexts(player.shouldFilterText()); + StringBuilder rawText = new StringBuilder(); + for (Text t : texts) { + rawText.append(t.getString()); + } + String text = rawText.toString(); + if (text.startsWith("/") && player.getMainHandStack().isOf(Items.AIR) && !player.isSneaking()) { + String actualCommand = text.substring(1); + // No cheating! + ServerCommandSource commandSource = player.getCommandSource(); + commandSource.getServer().getCommandManager().execute(commandSource, actualCommand); + } + } + } +} diff --git a/main/java/tech/mctown/cma/CMAEntry.java b/main/java/tech/mctown/cma/CMAEntry.java new file mode 100644 index 0000000..11d8a5a --- /dev/null +++ b/main/java/tech/mctown/cma/CMAEntry.java @@ -0,0 +1,11 @@ +package tech.mctown.cma; + +import carpet.CarpetServer; +import net.fabricmc.api.ModInitializer; + +public class CMAEntry implements ModInitializer { + @Override + public void onInitialize() { + CarpetServer.manageExtension(CMAExtension.INSTANCE); + } +} diff --git a/main/java/tech/mctown/cma/CMAExtension.java b/main/java/tech/mctown/cma/CMAExtension.java new file mode 100644 index 0000000..4a58f33 --- /dev/null +++ b/main/java/tech/mctown/cma/CMAExtension.java @@ -0,0 +1,30 @@ +package tech.mctown.cma; + +import carpet.CarpetExtension; +import carpet.CarpetServer; +import com.mojang.brigadier.CommandDispatcher; +import net.minecraft.server.command.ServerCommandSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import tech.mctown.cma.commands.DumpEntityCommand; + +public class CMAExtension implements CarpetExtension { + public static final CMAExtension INSTANCE = new CMAExtension(); + public static final String MODID = "CMA"; + public static final Logger LOGGER = LoggerFactory.getLogger(MODID); + + @Override + public String version() { + return MODID; + } + + @Override + public void onGameStarted() { + CarpetServer.settingsManager.parseSettingsClass(CMASettings.class); + } + + @Override + public void registerCommands(CommandDispatcher dispatcher) { + DumpEntityCommand.registerCommand(dispatcher); + } +} diff --git a/main/java/tech/mctown/cma/CMASettings.java b/main/java/tech/mctown/cma/CMASettings.java new file mode 100644 index 0000000..03ace2e --- /dev/null +++ b/main/java/tech/mctown/cma/CMASettings.java @@ -0,0 +1,45 @@ +package tech.mctown.cma; + +import carpet.settings.Rule; + +import java.lang.annotation.Target; + +import static carpet.settings.RuleCategory.*; + +public class CMASettings { + static final String CMA = CMAExtension.MODID; + + @Rule( + desc = "Execute the command on the sign if it's right-clicked by player who is not sneaking nor holding " + + "anything in the main hand.", + extra = {"Texts must start with '/'."}, + category = {CMA, SURVIVAL} + ) + public static boolean runCommandOnSign = false; + + @Rule( + desc = "Player can edit the sign when it's right-clicked if the player is sneaking and not holding anything " + + "in the main hand.", + category = {CMA, SURVIVAL} + ) + public static boolean editableSign = false; + + @Rule( + desc = "Observer will be activied when player uses Flint and Steel on it.", + extra = {"Sneak to light fire on observers."}, + category = {CMA, CREATIVE} + ) + public static boolean flintAndSteelActivatesObserver = false; + + @Rule( + desc = "Enable the usage of /dumpentity", + category = {CMA, CREATIVE, COMMAND} + ) + public static String commandDumpEntity = "true"; + + @Rule( + desc = "Op players can spawn bots in different gamemodes.", + category = {CMA, SURVIVAL} + ) + public static boolean fakePlayerGamemode = true; +} diff --git a/main/java/tech/mctown/cma/commands/DumpEntityCommand.java b/main/java/tech/mctown/cma/commands/DumpEntityCommand.java new file mode 100644 index 0000000..4d5ca2e --- /dev/null +++ b/main/java/tech/mctown/cma/commands/DumpEntityCommand.java @@ -0,0 +1,31 @@ +package tech.mctown.cma.commands; + +import carpet.settings.SettingsManager; +import carpet.utils.Messenger; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.context.CommandContext; +import net.minecraft.entity.Entity; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.Text; +import tech.mctown.cma.CMASettings; + +import static net.minecraft.server.command.CommandManager.literal; + +public class DumpEntityCommand { + public static void registerCommand(CommandDispatcher dispatcher) { + dispatcher.register( + literal("dumpentity").requires(src -> SettingsManager.canUseCommand(src, CMASettings.commandDumpEntity)) + .executes(DumpEntityCommand::dumpEntity) + ); + } + + public static int dumpEntity(CommandContext ctx) { + ServerCommandSource src = ctx.getSource(); + ServerWorld world = src.getWorld(); + for (Entity e : world.iterateEntities()) { + Messenger.m(src, Text.of(e.toString())); + } + return 0; + } +} diff --git a/main/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java b/main/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java new file mode 100644 index 0000000..6d5d7ec --- /dev/null +++ b/main/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java @@ -0,0 +1,25 @@ +package tech.mctown.cma.mixins.editableSign; + +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import tech.mctown.cma.CMASettings; + +@Mixin(SignBlockEntity.class) +public abstract class SignBlockEntityMixin { + @Shadow + abstract public void setEditable(boolean editable); + + @Inject(method = "onActivate", at = @At("HEAD")) + public void editSign(ServerPlayerEntity player, CallbackInfoReturnable ci) { + if (CMASettings.editableSign && player.getAbilities().allowModifyWorld && player.getMainHandStack().isOf(Items.AIR) && player.isSneaking()) { + this.setEditable(true); + player.openEditSignScreen((SignBlockEntity) (Object) this); + } + } +} diff --git a/main/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java b/main/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java new file mode 100644 index 0000000..bb630a3 --- /dev/null +++ b/main/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java @@ -0,0 +1,28 @@ +package tech.mctown.cma.mixins.fakePlayerGamemode; + +import carpet.commands.PlayerCommand; +import carpet.utils.Messenger; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import net.minecraft.server.command.ServerCommandSource; +import tech.mctown.cma.CMASettings; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PlayerCommand.class) +public abstract class PlayerCommandMixin { + @Inject(method = "cantSpawn", at = @At("HEAD"), remap = false) + static private void checkGamemode(CommandContext context, CallbackInfoReturnable ci) { + try { + StringArgumentType.getString(context, "gamemode"); + } catch (IllegalArgumentException e) { + return; + } + if (!CMASettings.fakePlayerGamemode) { + ci.setReturnValue(true); + } + } +} diff --git a/main/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java b/main/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java new file mode 100644 index 0000000..98363e6 --- /dev/null +++ b/main/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java @@ -0,0 +1,36 @@ +package tech.mctown.cma.mixins.flintAndSteelActivatesObserver; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.ObserverBlock; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.FlintAndSteelItem; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import tech.mctown.cma.CMASettings; + +@Mixin(FlintAndSteelItem.class) +public abstract class FlintAndSteelItemMixin { + @Inject(method = "useOnBlock", at = @At("HEAD"), cancellable = true) + void activatesObserver(ItemUsageContext context, CallbackInfoReturnable ci) { + if (CMASettings.flintAndSteelActivatesObserver) { + PlayerEntity playerEntity = context.getPlayer(); + if (playerEntity == null) return; + World world = context.getWorld(); + BlockPos blockPos = context.getBlockPos(); + BlockState blockState = world.getBlockState(blockPos); + + if (blockState.isOf(Blocks.OBSERVER) && !playerEntity.isSneaking()) { + ObserverBlock observer = (ObserverBlock) blockState.getBlock(); + observer.scheduleTick(world, blockPos); + ci.setReturnValue(ActionResult.success(world.isClient())); + } + } + } +} diff --git a/main/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java b/main/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java new file mode 100644 index 0000000..e418133 --- /dev/null +++ b/main/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java @@ -0,0 +1,37 @@ +package tech.mctown.cma.mixins.runCommandOnSign; + +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.item.Items; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import tech.mctown.cma.CMASettings; + +@Mixin(SignBlockEntity.class) +public abstract class SignBlockEntityMixin { + @Shadow + protected abstract Text[] getTexts(boolean filtered); + + @Inject(method = "onActivate", at = @At("HEAD")) + public void runCommandOnActivated(ServerPlayerEntity player, CallbackInfoReturnable ci) { + if (CMASettings.runCommandOnSign) { + Text[] texts = this.getTexts(player.shouldFilterText()); + StringBuilder rawText = new StringBuilder(); + for (Text t : texts) { + rawText.append(t.getString()); + } + String text = rawText.toString(); + if (text.startsWith("/") && player.getMainHandStack().isOf(Items.AIR) && !player.isSneaking()) { + String actualCommand = text.substring(1); + // No cheating! + ServerCommandSource commandSource = player.getCommandSource(); + commandSource.getServer().getCommandManager().execute(commandSource, actualCommand); + } + } + } +} diff --git a/main/resources/assets/cma/icon.jpeg b/main/resources/assets/cma/icon.jpeg new file mode 100644 index 0000000..7982a75 Binary files /dev/null and b/main/resources/assets/cma/icon.jpeg differ diff --git a/main/resources/assets/cma/icon.png b/main/resources/assets/cma/icon.png new file mode 100644 index 0000000..aaccdd5 Binary files /dev/null and b/main/resources/assets/cma/icon.png differ diff --git a/main/resources/cma.accesswidener b/main/resources/cma.accesswidener new file mode 100644 index 0000000..7da2d2f --- /dev/null +++ b/main/resources/cma.accesswidener @@ -0,0 +1,3 @@ +accessWidener v1 named + +accessible method net/minecraft/block/ObserverBlock scheduleTick (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;)V diff --git a/main/resources/cma.mixins.json b/main/resources/cma.mixins.json new file mode 100644 index 0000000..f30e5d3 --- /dev/null +++ b/main/resources/cma.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "package": "tech.mctown.cma.mixins", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "editableSign.SignBlockEntityMixin", + "flintAndSteelActivatesObserver.FlintAndSteelItemMixin", + "runCommandOnSign.SignBlockEntityMixin", + "fakePlayerGamemode.PlayerCommandMixin" + ], + "server": [], + "client": [], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/main/resources/fabric.mod.json b/main/resources/fabric.mod.json new file mode 100644 index 0000000..d33b346 --- /dev/null +++ b/main/resources/fabric.mod.json @@ -0,0 +1,37 @@ +{ + "schemaVersion": 1, + "id": "cma", + "version": "${version}", + "name": "Carpet MCT Addition", + "description": "Random Minecraft features.", + "authors": [ + "xiaoyu2006", + "Apricityx_" + ], + "contact": { + "homepage": "https://www.mctown.tech/", + "sources": "https://github.com/MCTown/carpet-mct-addition" + }, + "license": "MIT", + "icon": "assets/cma/icon.jpeg", + "environment": "*", + "entrypoints": { + "main": [ + "tech.mctown.cma.CMAEntry" + ] + }, + "mixins": [ + "cma.mixins.json" + ], + "accessWidener": "cma.accesswidener", + "depends": { + "minecraft": "1.21.x", + "fabricloader": ">=0.13", + "carpet": "*" + }, + "custom": { + "modmanager": { + "modrinth": "pY40IXqI" + } + } +} diff --git a/resources/assets/cma/icon.jpeg b/resources/assets/cma/icon.jpeg new file mode 100644 index 0000000..7982a75 Binary files /dev/null and b/resources/assets/cma/icon.jpeg differ diff --git a/resources/assets/cma/icon.png b/resources/assets/cma/icon.png new file mode 100644 index 0000000..aaccdd5 Binary files /dev/null and b/resources/assets/cma/icon.png differ diff --git a/resources/cma.accesswidener b/resources/cma.accesswidener new file mode 100644 index 0000000..7da2d2f --- /dev/null +++ b/resources/cma.accesswidener @@ -0,0 +1,3 @@ +accessWidener v1 named + +accessible method net/minecraft/block/ObserverBlock scheduleTick (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;)V diff --git a/resources/cma.mixins.json b/resources/cma.mixins.json new file mode 100644 index 0000000..f30e5d3 --- /dev/null +++ b/resources/cma.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "package": "tech.mctown.cma.mixins", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "editableSign.SignBlockEntityMixin", + "flintAndSteelActivatesObserver.FlintAndSteelItemMixin", + "runCommandOnSign.SignBlockEntityMixin", + "fakePlayerGamemode.PlayerCommandMixin" + ], + "server": [], + "client": [], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/resources/fabric.mod.json b/resources/fabric.mod.json new file mode 100644 index 0000000..d33b346 --- /dev/null +++ b/resources/fabric.mod.json @@ -0,0 +1,37 @@ +{ + "schemaVersion": 1, + "id": "cma", + "version": "${version}", + "name": "Carpet MCT Addition", + "description": "Random Minecraft features.", + "authors": [ + "xiaoyu2006", + "Apricityx_" + ], + "contact": { + "homepage": "https://www.mctown.tech/", + "sources": "https://github.com/MCTown/carpet-mct-addition" + }, + "license": "MIT", + "icon": "assets/cma/icon.jpeg", + "environment": "*", + "entrypoints": { + "main": [ + "tech.mctown.cma.CMAEntry" + ] + }, + "mixins": [ + "cma.mixins.json" + ], + "accessWidener": "cma.accesswidener", + "depends": { + "minecraft": "1.21.x", + "fabricloader": ">=0.13", + "carpet": "*" + }, + "custom": { + "modmanager": { + "modrinth": "pY40IXqI" + } + } +} diff --git a/settings.gradle b/settings.gradle index f91a4fe..75c4d72 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,10 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } -} + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/tech/mctown/cma/CMAExtension.java b/src/main/java/tech/mctown/cma/CMAExtension.java index 4a58f33..31b3926 100644 --- a/src/main/java/tech/mctown/cma/CMAExtension.java +++ b/src/main/java/tech/mctown/cma/CMAExtension.java @@ -13,10 +13,10 @@ public class CMAExtension implements CarpetExtension { public static final String MODID = "CMA"; public static final Logger LOGGER = LoggerFactory.getLogger(MODID); - @Override - public String version() { - return MODID; - } +// @Override +// public String version() { +// return MODID; +// } @Override public void onGameStarted() { diff --git a/src/main/resources/cma.mixins.json b/src/main/resources/cma.mixins.json index b1074e9..f30e5d3 100644 --- a/src/main/resources/cma.mixins.json +++ b/src/main/resources/cma.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "tech.mctown.cma.mixins", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "editableSign.SignBlockEntityMixin", "flintAndSteelActivatesObserver.FlintAndSteelItemMixin", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 69f2f75..d33b346 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ ], "accessWidener": "cma.accesswidener", "depends": { - "minecraft": "1.18.x", + "minecraft": "1.21.x", "fabricloader": ">=0.13", "carpet": "*" },