From 3949797fa186054207d2079b9f4136dc170c637b Mon Sep 17 00:00:00 2001 From: Bibi Reden Date: Thu, 29 Aug 2024 21:03:01 -0500 Subject: [PATCH 1/2] Revert "[fix] resolve translation key for item breaking config" This reverts commit d9d60acde6c857beb24c7354c9e5375965372dfa. --- src/main/resources/assets/playerex/lang/en_us.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/assets/playerex/lang/en_us.json b/src/main/resources/assets/playerex/lang/en_us.json index 9b7b484b..9948c8ca 100644 --- a/src/main/resources/assets/playerex/lang/en_us.json +++ b/src/main/resources/assets/playerex/lang/en_us.json @@ -182,7 +182,6 @@ "text.config.playerex-config.category.visualSettings": "Visual Options", "text.config.playerex-config.option.visualSettings.nameplateColor": "Nameplate Color", - "text.config.playerex-config.option.itemBreakingEnabled": "Item Breaking Enabled", "text.config.playerex-config.option.resetOnDeath": "Reset on Death", "text.config.playerex-config.option.skillPointsPerLevelUp": "Skill Points per. Level Up", "text.config.playerex-config.option.levelFormula": "Leveling Formula", From 32ccbf94450e293bdff9e873175d5770fd0314d3 Mon Sep 17 00:00:00 2001 From: Bibi Reden Date: Sat, 12 Oct 2024 14:17:44 -0500 Subject: [PATCH 2/2] [fix] Fixed attributes on stock --- CHANGELOG.md | 6 +++-- gradle.properties | 2 +- .../data_attributes/functions/stock.json | 4 ++-- .../data_attributes/overrides/minecraft.json | 1 - .../overrides/spell_power.json | 22 ------------------- .../data_attributes/overrides/stock.json | 7 +++++- src/main/resources/fabric.mod.json | 4 ++-- 7 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 src/main/resources/data/playerex/data_attributes/overrides/spell_power.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 43088382..f4b4bfd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ ## Changes 🌽 -- Patched to work with Data Attributes `2.X.X+1.20.1`. Update to that for this to work. -- Integrate back all of the attributes and their proper diminishing factor according to **BalanceEX** and some suggestions. \ No newline at end of file +- Fixed attributes that were **NOT** meant to be diminishing. +- Fixed attributes which were not formatted to be percentages to actually display as them. + - Melee Crit Damage + - Health Regeneration \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8fcacd28..77d5426d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ parchment_version=1.20.1:2023.09.03 quilt_mappings_version=23 # Mod Properties -mod_version=4.0.0+1.20.1-beta.7 +mod_version=4.0.0+1.20.1-beta.8 maven_group=com.bibireden.playerex archives_base_name=playerex-directors-cut diff --git a/src/main/resources/data/playerex/data_attributes/functions/stock.json b/src/main/resources/data/playerex/data_attributes/functions/stock.json index 89340234..64874f3a 100644 --- a/src/main/resources/data/playerex/data_attributes/functions/stock.json +++ b/src/main/resources/data/playerex/data_attributes/functions/stock.json @@ -24,7 +24,7 @@ "spell_power:critical_chance": { "enabled": true, "behavior": "Add", - "value": 0.02 + "value": 2 } }, "playerex:dexterity": { @@ -90,7 +90,7 @@ "spell_power:haste": { "enabled": true, "behavior": "Add", - "value": 2 + "value": 1 } }, "playerex:focus": { diff --git a/src/main/resources/data/playerex/data_attributes/overrides/minecraft.json b/src/main/resources/data/playerex/data_attributes/overrides/minecraft.json index cc24c151..a8a824fd 100644 --- a/src/main/resources/data/playerex/data_attributes/overrides/minecraft.json +++ b/src/main/resources/data/playerex/data_attributes/overrides/minecraft.json @@ -16,7 +16,6 @@ "enabled": true, "min": 0.0, "max": 1000000.0, - "smoothness": 1.0, "formula": "Flat" } } diff --git a/src/main/resources/data/playerex/data_attributes/overrides/spell_power.json b/src/main/resources/data/playerex/data_attributes/overrides/spell_power.json deleted file mode 100644 index ad6cdc5a..00000000 --- a/src/main/resources/data/playerex/data_attributes/overrides/spell_power.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "entries": { - "spell_power:haste": { - "enabled": true, - "min": 100.0, - "max": 1000.0, - "smoothness": 1.0, - "min_fallback": 100.0, - "max_fallback": 1000.0, - "formula": "Diminished" - }, - "spell_power:critical_chance": { - "enabled": true, - "min": 100.0, - "max": 1000.0, - "smoothness": 1.0, - "min_fallback": 100.0, - "max_fallback": 1000.0, - "formula": "Diminished" - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/playerex/data_attributes/overrides/stock.json b/src/main/resources/data/playerex/data_attributes/overrides/stock.json index 5d477707..190724ce 100644 --- a/src/main/resources/data/playerex/data_attributes/overrides/stock.json +++ b/src/main/resources/data/playerex/data_attributes/overrides/stock.json @@ -36,6 +36,10 @@ "formula": "Diminished", "format": "Percentage" }, + "playerex:health_regeneration": { + "enabled": true, + "format": "Percentage" + }, "playerex:melee_crit_chance": { "enabled": true, "min": 0.0, @@ -49,7 +53,8 @@ "min": 0.0, "max": 1.0, "smoothness": 0.001, - "formula": "Diminished" + "formula": "Diminished", + "format": "Percentage" }, "playerex:lifesteal": { "enabled": true, diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7c29df0a..2a4c552b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -82,7 +82,7 @@ "java": ">=17", "fabric-api": "*", "fabric-language-kotlin": ">=1.10.19+kotlin.1.9.23", - "data_attributes": ">=2.0.0+1.20.1-beta.9-fabric", + "data_attributes": ">=2.0.0+1.20.1-fabric", "ranged_weapon_api": ">=1.1.0+1.20.1" }, "custom": { @@ -97,7 +97,7 @@ "dependencies": [ "fabric-api@>=0.92.2+1.20.1(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github)", "fabric-language-kotlin@>=1.9.5+kotlin.1.8.22(required){modrinth:Ha28R6CL}{curseforge:308769}#(ignore:github)", - "data-attributes-directors-cut@>=2.0.0+1.20.1-beta.9-fabric(required){modrinth:KCGxOJsE}{curseforge:955929}#(ignore:github)", + "data-attributes-directors-cut@>=2.0.0+1.20.1-fabric(required){modrinth:KCGxOJsE}{curseforge:955929}#(ignore:github)", "owo-lib@0.11.2(required){modrinth:ccKDOlHs}{curseforge:532610}#(ignore:github)", "ranged_weapon_api@>=1.1.0+1.20.1(required){modrinth:AqaIIO6D}{curseforge:962162}#(ignore:github)", "cardinal-components@5.2.2(embedded){modrinth:K01OU20C}{curseforge:318449}#(ignore:github)",