Merge branch '1.20.1/dev' into 1.20.1/fabric

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.
+- 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

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
 

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",

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": {

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"
         }
     }

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,

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)",
 				"[email protected](required){modrinth:ccKDOlHs}{curseforge:532610}#(ignore:github)",
 				"ranged_weapon_api@>=1.1.0+1.20.1(required){modrinth:AqaIIO6D}{curseforge:962162}#(ignore:github)",
 				"[email protected](embedded){modrinth:K01OU20C}{curseforge:318449}#(ignore:github)",