From 3c64025d79907500898c5deb0a7e98cac9b54211 Mon Sep 17 00:00:00 2001 From: CleverNucleus Date: Sun, 6 Feb 2022 13:45:14 +0000 Subject: [PATCH] Updated CCA version *Updated CCA version to 4.1.1 and to use their new maven. Still doesn't fix their issue with installing CCA standalone with mods that have it jar-in-jar. -Removed obsolete property from ExAPI. --- build.gradle | 8 ++++---- gradle.properties | 2 +- .../java/com/github/clevernucleus/playerex/api/ExAPI.java | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 4a3c1b53..6f681d9e 100644 --- a/build.gradle +++ b/build.gradle @@ -39,10 +39,10 @@ dependencies { modImplementation "com.github.clevernucleus:OfflinePlayerCache:${project.opc_version}" include "com.github.clevernucleus:OfflinePlayerCache:${project.opc_version}" - modImplementation "io.github.onyxstudios.Cardinal-Components-API:cardinal-components-base:${project.cardinal_components_version}" - include "io.github.onyxstudios.Cardinal-Components-API:cardinal-components-base:${project.cardinal_components_version}" - modImplementation "io.github.onyxstudios.Cardinal-Components-API:cardinal-components-entity:${project.cardinal_components_version}" - include "io.github.onyxstudios.Cardinal-Components-API:cardinal-components-entity:${project.cardinal_components_version}" + modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}" + include "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}" + modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cardinal_components_version}" + include "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cardinal_components_version}" modImplementation("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") diff --git a/gradle.properties b/gradle.properties index eb6c4383..bb15f586 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1G fabric_version=0.46.1+1.18 dataattributes_version=1.1.5 opc_version=0.0.1 - cardinal_components_version=4.0.1 + cardinal_components_version=4.1.1 placeholder_api=1.1.3+1.17.1 cloth_config_version=6.1.48 modmenu_version=3.0.0 diff --git a/src/main/java/com/github/clevernucleus/playerex/api/ExAPI.java b/src/main/java/com/github/clevernucleus/playerex/api/ExAPI.java index fdc68da3..a7bacb4f 100644 --- a/src/main/java/com/github/clevernucleus/playerex/api/ExAPI.java +++ b/src/main/java/com/github/clevernucleus/playerex/api/ExAPI.java @@ -28,8 +28,6 @@ public final class ExAPI { public static final String PERCENTAGE_PROPERTY = "percentage"; /** Multiply value by property. */ public static final String MULTIPLIER_PROPERTY = "multiplier"; - /** Multiply value by property. */ - public static final String REFUNDABLE_PROPERTY = "refundable"; /** The Cardinal Components Key for PlayerEx modifier data. */ public static final ComponentKey INSTANCE = ComponentRegistry.getOrCreate(new Identifier(MODID, "data"), PlayerData.class); /** The CacheableValue key to access player's level. */