From c1edf520ab2bf4cc57a0d325ff27367f76ed6f5e Mon Sep 17 00:00:00 2001 From: Zsolt Molnar Date: Sun, 28 Jan 2024 18:00:43 +0100 Subject: [PATCH] Improve First Person Model compatibility #329 --- CHANGELOG.md | 1 + build.gradle | 2 +- common/build.gradle | 2 +- .../bettercombat/compatibility/FirstPersonModelHelper.java | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbcecc2e..74e5fed1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Fix ReplayMod Compat, thanks to Smartin-b #317 #24 - Fix Pehkui Compatibility, thanks to Leximon #326 +- Improve First Person Model compatibility #329 # 1.8.3 diff --git a/build.gradle b/build.gradle index 02929ac8..367e73c3 100755 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false id "org.cadixdev.licenser" version "0.6.1" id "io.github.juuxel.loom-quiltflower" version "1.7.+" apply false id "me.shedaniel.unified-publishing" version "0.1.+" apply false diff --git a/common/build.gradle b/common/build.gradle index f1936985..8db36230 100755 --- a/common/build.gradle +++ b/common/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation ("com.github.ZsoltMolnarrr:TinyConfig:${project.tiny_config_version}") modCompileOnly("com.terraformersmc:modmenu:${rootProject.mod_menu_version}") { transitive false } - modCompileOnly "maven.modrinth:first-person-model:${project.fpm_version}" + modCompileOnly("maven.modrinth:first-person-model:${project.fpm_version}") } architectury { diff --git a/common/src/main/java/net/bettercombat/compatibility/FirstPersonModelHelper.java b/common/src/main/java/net/bettercombat/compatibility/FirstPersonModelHelper.java index be231b50..fbf5f40b 100644 --- a/common/src/main/java/net/bettercombat/compatibility/FirstPersonModelHelper.java +++ b/common/src/main/java/net/bettercombat/compatibility/FirstPersonModelHelper.java @@ -1,13 +1,13 @@ package net.bettercombat.compatibility; -import dev.tr7zw.firstperson.FirstPersonModelCore; +import dev.tr7zw.firstperson.api.FirstPersonAPI; import java.util.function.Supplier; public class FirstPersonModelHelper { public static Supplier isDisabled() { return (() -> { - return !FirstPersonModelCore.enabled; + return !FirstPersonAPI.isEnabled(); }); } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59bc51a2..db9a6b82 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists