From d239919b8acc753fc7f42ffbea62a4cf52190324 Mon Sep 17 00:00:00 2001
From: Bibi Reden <redwitblue@gmail.com>
Date: Sun, 4 Aug 2024 00:25:50 -0500
Subject: [PATCH] alpha.10 (resolve refund & mixinextras) (#20)

* Fix issue with FOCUS not being recognized in refunds.

* CL & alpha.10 staging
---
 .github/workflows/build-and-deploy.yml                      | 4 +++-
 CHANGELOG.md                                                | 5 +++--
 build.gradle                                                | 2 ++
 gradle.properties                                           | 6 ++++--
 .../kotlin/com/bibireden/playerex/factory/RefundFactory.kt  | 1 +
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 2fc43aec..47505dc2 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -1,12 +1,14 @@
-name: Build and Deploy
+name: Deployment (J17)
 on:
   push:
     branches-ignore:
       - master
+      - "**/dev**"
       - "**-dev"
       - "**-dev**"
       - dev
 
+
 jobs:
   build-and-deploy:
     env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea43764e..f22d84ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,3 @@
-## Changes ⚒️
-- Resolved issues with OPC.
\ No newline at end of file
+## Changes 🌽
+- Fixed issue with the new attribute **Focus** not being recognized in `RefundFactory`.
+- Updated mixinextras directly in the mod to 0.4.0.
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9a24f981..57cf8252 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,6 +98,8 @@ dependencies {
 	modImplementation include("eu.pb4:placeholder-api:${project.placeholder_api_version}")
 
 	implementation include("net.objecthunter:exp4j:${project.exp4j_version}")
+
+	include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
 }
 
 processResources {
diff --git a/gradle.properties b/gradle.properties
index bb219371..3222f817 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-alpha.9
+mod_version=4.0.0+1.20.1-alpha.10
 maven_group=com.bibireden.playerex
 archives_base_name=playerex-directors-cut
 
@@ -31,7 +31,7 @@ ranged_weapon_api_version=1.1.2+1.20.1
 
 # in-house
 opc_version=2.0.0+1.20.1-beta.2-fabric
-data_attributes_version=2.0.0-beta.7+1.20.1-fabric
+data_attributes_version=2.0.0-beta.8+1.20.1-fabric
 
 # owo
 owo_version=0.11.2+1.20
@@ -42,3 +42,5 @@ endec_gson_version=0.1.4
 endec_netty_version=0.1.3
 
 exp4j_version=0.4.8
+
+mixinextras_version=0.4.0
diff --git a/src/main/kotlin/com/bibireden/playerex/factory/RefundFactory.kt b/src/main/kotlin/com/bibireden/playerex/factory/RefundFactory.kt
index 24bb810c..6b4331e7 100644
--- a/src/main/kotlin/com/bibireden/playerex/factory/RefundFactory.kt
+++ b/src/main/kotlin/com/bibireden/playerex/factory/RefundFactory.kt
@@ -12,5 +12,6 @@ object RefundFactory {
         registry.accept { data, player -> data.get(PlayerEXAttributes.DEXTERITY) }
         registry.accept { data, player -> data.get(PlayerEXAttributes.INTELLIGENCE) }
         registry.accept { data, player -> data.get(PlayerEXAttributes.LUCKINESS) }
+        registry.accept { data, player -> data.get(PlayerEXAttributes.FOCUS) }
     }
 }
\ No newline at end of file