mirror of
https://github.com/CPTProgrammer/ChatPlus.git
synced 2026-08-04 01:56:39 +08:00
Merge branch 'temp' into kaituo
This commit is contained in:
APairOfMoons
commit
84ee531015
@ -20,6 +20,8 @@ assert loomRemapStr in ["true", "false"] :
|
||||
def loomRemap = loomRemapStr.toBoolean()
|
||||
apply plugin: loomRemap ? "net.fabricmc.fabric-loom-remap" : "net.fabricmc.fabric-loom"
|
||||
|
||||
boolean hasNewVersionScheme = project.targetVersion.tokenize(".")*.toInteger()[0] >= 26
|
||||
|
||||
generateBuildProperties(project.minecraftVersions, project.targetVersion)
|
||||
|
||||
version = "${project.mod_version}-mc${project.targetVersion}"
|
||||
@ -93,11 +95,12 @@ dependencies {
|
||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||
if (loomRemap) mappings loom.officialMojangMappings()
|
||||
remappableImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
|
||||
remappableImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}+${project.targetVersion}"
|
||||
|
||||
def resolvedFabricApiVersion = "${project.fabric_api_version}+${project.targetVersion}"
|
||||
// Override Fabric API version for local testing (runClient/runServer)
|
||||
if (project.hasProperty("test_fabric_api_version"))
|
||||
remappableLocalRuntime "net.fabricmc.fabric-api:fabric-api:${project.test_fabric_api_version}"
|
||||
resolvedFabricApiVersion = "${project.test_fabric_api_version}"
|
||||
remappableImplementation "net.fabricmc.fabric-api:fabric-api:${resolvedFabricApiVersion}"
|
||||
|
||||
// Mod Compatibility
|
||||
if (project.hasProperty("mod_dynmap_version") && !project.mod_dynmap_version.allWhitespace)
|
||||
@ -118,7 +121,7 @@ processResources {
|
||||
def expandProperties = [
|
||||
"version": mod_version,
|
||||
"group": maven_group,
|
||||
"minecraft_version": minecraft_version,
|
||||
"minecraft_version_range": "${hasNewVersionScheme ? "^" : "~"}${targetVersion}",
|
||||
"java_version": java_version,
|
||||
"fabric_loader_version": fabric_loader_version,
|
||||
"fabric_loader_version_range": hasProperty("min_fabric_loader_version") && !min_fabric_loader_version.allWhitespace ? ">=${min_fabric_loader_version}" : "*",
|
||||
|
||||
@ -6,7 +6,7 @@ org.gradle.parallel=true
|
||||
version_properties_path=./properties
|
||||
|
||||
# Mod Properties
|
||||
mod_version=1.2.0
|
||||
mod_version=1.2.1
|
||||
maven_group=cn.revaria.chatplus
|
||||
archives_base_name=chat-plus
|
||||
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -2,6 +2,8 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
|
||||
networkTimeout=10000
|
||||
retries=0
|
||||
retryBackOffMs=500
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
6
gradlew
vendored
6
gradlew
vendored
@ -20,7 +20,7 @@
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
# gradlew start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
@ -29,7 +29,7 @@
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
# ksh gradlew
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
@ -57,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/.
|
||||
|
||||
35
gradlew.bat
vendored
35
gradlew.bat
vendored
@ -19,12 +19,12 @@
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem gradlew startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
||||
setlocal EnableExtensions
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@ -51,7 +51,7 @@ 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
|
||||
"%COMSPEC%" /c exit 1
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
@ -65,29 +65,18 @@ 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
|
||||
"%COMSPEC%" /c exit 1
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
@rem Execute gradlew
|
||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
||||
@rem which allows us to clear the local environment before executing the java command
|
||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
||||
|
||||
: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
|
||||
:exitWithErrorLevel
|
||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
||||
|
||||
@ -60,7 +60,7 @@ static String findLatestCompatibleVersion(List<String> sortedVersions, String ve
|
||||
sortedVersions.findAll {
|
||||
def versionList = it.tokenize(".")*.toInteger()
|
||||
compareMinecraftVersion(versionList, targetVersionList) <= 0 &&
|
||||
(targetVersionList[0] == versionList[0] && targetVersionList[1] == versionList[1])
|
||||
(targetVersionList[0] == versionList[0] && (targetVersionList[0] >= 26 || targetVersionList[1] == versionList[1]))
|
||||
}.max { a, b -> compareMinecraftVersion(a, b) }
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": "${fabric_loader_version_range}",
|
||||
"minecraft": "~${minecraft_version}",
|
||||
"minecraft": "${minecraft_version_range}",
|
||||
"java": ">=${java_version}",
|
||||
"${fabric_api_mod_id}": ">=${fabric_api_version}"
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user