R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Caner Karaca 2024-07-22 23:21:50 +00:00
parent b2eb14b766
commit 7c2aeba767
10 changed files with 139 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
annotation-processor/build.gradle
View File

@ -14,20 +14,20 @@ dependencies {
annotationProcessor 'com.google.auto.service:auto-service:1.1.1' annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
compileOnly 'com.google.auto.service:auto-service:1.1.1' compileOnly 'com.google.auto.service:auto-service:1.1.1'
implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.code.gson:gson:2.11.0'
shadow 'com.google.code.gson:gson:2.10.1' shadow 'com.google.code.gson:gson:2.11.0'
implementation 'com.google.auto:auto-common:1.2.1' implementation 'com.google.auto:auto-common:1.2.2'
shadow 'com.google.auto:auto-common:1.2.1' shadow 'com.google.auto:auto-common:1.2.2'
implementation 'com.google.guava:guava:21.0' implementation 'com.google.guava:guava:33.2.1-jre'
shadow 'com.google.guava:guava:21.0' shadow 'com.google.guava:guava:33.2.1-jre'
implementation project(":annotations") implementation project(":annotations")
shadow project(":annotations") shadow project(":annotations")
// Shadow annotations // Shadow annotations
implementation 'net.fabricmc:sponge-mixin:0.12.5+' implementation 'net.fabricmc:sponge-mixin:0.15.0+'
implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
implementation 'net.minecraftforge:mergetool:1.1.7' implementation 'net.minecraftforge:mergetool:1.2.3'
implementation 'net.neoforged:mergetool:2.0.2' implementation 'net.neoforged:mergetool:2.0.5'
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {

10
build.gradle
View File

@ -1,11 +1,11 @@
plugins { plugins {
id "architectury-plugin" version "3.4-SNAPSHOT" id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.6.396" apply false id "dev.architectury.loom" version "1.7.410" apply false
id "maven-publish" id "maven-publish"
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.palantir.git-version' version '1.0.0' id 'com.palantir.git-version' version '3.1.0'
id 'org.ajoberstar.grgit' version '5.2.0' id 'org.ajoberstar.grgit' version '5.2.2'
id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '1.79.0' id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '2.1.2'
id "com.modrinth.minotaur" version "2.+" apply false id "com.modrinth.minotaur" version "2.+" apply false
id("com.diffplug.spotless") version "6.25.0" apply false id("com.diffplug.spotless") version "6.25.0" apply false
id 'modernfix.common-conventions' apply false id 'modernfix.common-conventions' apply false
@ -29,7 +29,7 @@ tasks.withType(JavaCompile).configureEach {
// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
// We'll use that if it's available, but otherwise we'll use the older option. // We'll use that if it's available, but otherwise we'll use the older option.
def targetVersion = 8 def targetVersion = 21
/* /*
if (JavaVersion.current().isJava9Compatible()) { if (JavaVersion.current().isJava9Compatible()) {
options.release = targetVersion options.release = targetVersion

4
fabric/src/main/resources/fabric.mod.json
View File

@ -41,8 +41,8 @@
"modernfix-common.mixins.json" "modernfix-common.mixins.json"
], ],
"depends": { "depends": {
"minecraft": ">=1.16.2", "minecraft": ">=1.21",
"fabricloader": ">=0.15.0" "fabricloader": ">=0.16.0"
}, },
"breaks": { "breaks": {
"dashloader": "<5.0.0-beta.1" "dashloader": "<5.0.0-beta.1"

24
gradle.properties
View File

@ -1,8 +1,8 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
junit_version=5.10.0-M1 junit_version=5.10.3
mixinextras_version=0.3.2 mixinextras_version=0.4.0
mod_id=modernfix mod_id=modernfix
minecraft_version=1.21 minecraft_version=1.21
@ -10,19 +10,19 @@ enabled_platforms=fabric,neoforge
forge_version=21.0.111-beta forge_version=21.0.111-beta
parchment_version=2024.07.07 parchment_version=2024.07.07
refined_storage_version=4392788 refined_storage_version=4392788
jei_version=19.0.0.9 jei_version=19.5.0.47
rei_version=13.0.678 rei_version=16.0.744
ctm_version=1.20.1-1.1.8+4 ctm_version=1.21-1.2.0+2
kubejs_version=1902.6.0-build.142 kubejs_version=2001.6.5-build.14
rhino_version=1902.2.2-build.268 rhino_version=2100.2.5-build.44
supported_minecraft_versions=1.21 supported_minecraft_versions=1.21
fabric_loader_version=0.15.11 fabric_loader_version=0.16.0
fabric_api_version=0.100.0+1.21 fabric_api_version=0.100.7+1.21
continuity_version=3.0.0-beta.4+1.20.2 continuity_version=3.0.0-beta.5+1.21
modmenu_version=7.0.0-beta.2 modmenu_version=11.0.1
diagonal_fences_version=4558828 diagonal_fences_version=4558828
spark_version=4587310 spark_version=4587310
@ -30,4 +30,4 @@ spark_version=4587310
use_fabric_api_at_runtime=false use_fabric_api_at_runtime=false
# Look up maven coordinates when changing shadow_version # Look up maven coordinates when changing shadow_version
shadow_version=7.1.2 shadow_version=8.1.1

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

7
gradlew vendored
View File

@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (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 # 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. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit 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. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

22
gradlew.bat vendored
View File

@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail

2
neoforge/build.gradle
View File

@ -57,7 +57,7 @@ dependencies {
modCompileOnly files("deps/ctm.jar") modCompileOnly files("deps/ctm.jar")
modCompileOnly("curse.maven:supermartijncore-454372:4455391") modCompileOnly("curse.maven:supermartijncore-454372:4455391")
modCompileOnly("vazkii.patchouli:Patchouli:1.19.2-77") modCompileOnly("vazkii.patchouli:Patchouli:1.20.6-86")
// runtime remapping at home // runtime remapping at home
for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) { for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {

10
test_agent/build.gradle
View File

@ -8,8 +8,8 @@ group 'org.embeddedt'
archivesBaseName = 'modernfix-test-agent' archivesBaseName = 'modernfix-test-agent'
version '1.0' version '1.0'
sourceCompatibility = '1.8' sourceCompatibility = '21'
targetCompatibility = '1.8' targetCompatibility = '21'
repositories { repositories {
mavenCentral() mavenCentral()
@ -36,9 +36,9 @@ shadowJar {
*/ */
dependencies { dependencies {
compileOnly "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" compileOnly "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
implementation "org.ow2.asm:asm-tree:9.1" implementation "org.ow2.asm:asm-tree:9.7"
implementation "org.ow2.asm:asm-commons:9.1" implementation "org.ow2.asm:asm-commons:9.7"
implementation "org.ow2.asm:asm-util:9.1" implementation "org.ow2.asm:asm-util:9.7"
//implementation('net.bytebuddy:byte-buddy-agent:1.12.22') //implementation('net.bytebuddy:byte-buddy-agent:1.12.22')
} }