Skip to content

Commit 1592ae2

Browse files
committed
toc bump mainly
1 parent 983f790 commit 1592ae2

File tree

12 files changed

+51
-61
lines changed

12 files changed

+51
-61
lines changed

.github/workflows/commits.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ on:
1010
jobs:
1111
Discord_Notification:
1212
runs-on: ubuntu-latest
13+
env:
14+
CF_API_KEY: ${{ secrets.CF_API_KEY }}
15+
# WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
16+
# GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
17+
WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
1318
steps:
1419
- name: Checkout Repository
15-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
1621
- name: Set enviroment
1722
shell: bash
1823
run: |
@@ -24,3 +29,5 @@ jobs:
2429
webhook: ${{ secrets.DISCORD_COMMITS_WEBHOOK }}
2530
message: "\u200B"
2631
embed: '{"title": "**{{ commit.title }}**","description": "{{ commit.description }}\u200B","author": {"name": "{{ commit.author.username }}","icon_url": "https://github.com/{{ commit.author.username }}.png","url": "https://github.com/{{ commit.author.username }}"},"image": {"url": "https://repository-images.githubusercontent.com/482364703/3140862c-8faf-45cd-bd5f-7f62968dbd23"},"fields": [{"name": "AddOn","value": "[{{ github.context.payload.repository.name}}]({{ github.context.payload.repository.html_url }})","inline": true},{"name": "Branch","value": "${{ env.branch }}","inline": true},{"name": "SHA","value": "[${{ env.sha_short }}]({{ commit.url }})","inline": true},{"name": "Diff","value": "[Show Diff]({{ github.context.payload.compare }})","inline": true}]}'
32+
- name: Package and release
33+
uses: BigWigsMods/packager@master

.github/workflows/release.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,16 @@ jobs:
1919
RR_AUTHOR_SUPPORT_INFO_NAME: "general-info"
2020
RR_AUTHOR_SUPPORT_INFO_URL: "https://discord.com/channels/1162274244487561216/1171940634672767128"
2121
RR_ADDON_CHANNEL_NAME: "keybind-display"
22-
RR_ADDON_CHANNEL_URL: "https://discord.com/channels/1162274244487561216/1162288001930514494"
22+
RR_ADDON_CHANNEL_URL: "https://discord.com/channels/1162274244487561216/1266211031185756190"
2323
steps:
2424
- name: Clone Project
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 100
2828
- name: Setup Environment
2929
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
3030
- name: Release Job
3131
uses: BigWigsMods/packager@master
32-
- name: Notify Discord
33-
if: success()
34-
uses: repooc/djs-actions@my_changes
35-
with:
36-
id: ${{ secrets.DISCORD_WEBHOOK_ID }}
37-
token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
38-
title: 'New **__${{ github.event.repository.name }}__** *Version Released!*'
39-
description: '[${{ github.event.sender.login }}](${{ github.event.sender.html_url }}) has released a new version of ${{ github.event.repository.name }}!
40-
41-
If you use a wow addon client that can download from either wago addons or curse, then it is recommended that you use that to install/update the addon. You can update how you see fit, even if you want to download manually and install it, go for it. The can grab the addon from the links down below.'
42-
fields: '[{"name": "Released By:", "value": "[${{ github.event.sender.login }}](${{ github.event.sender.html_url }})", "inline": true}, {"name": "Issue Tracker:", "value": "[${{ github.event.repository.name }}](${{ github.event.repository.html_url }}/issues)", "inline": true}, {"name": "Version", "value": "${{ env.RELEASE_VERSION }}", "inline": true}, {"name": "Wago Addons", "value": "[Click Here](${{ env.WAGO_URL }})", "inline": true}, {"name": "Curseforge", "value": "[Click Here](${{ env.CF_URL }})", "inline": true}, {"name": "Changelog", "value": "[Click Here](${{ github.event.repository.html_url }}/blob/main/CHANGELOG.txt)", "inline": true}]'
43-
footer: Repooc Reforged
44-
timestamp: true
4532
- name: Publish
4633
id: publish-to-discord
4734
uses: Crec0/announce-n-crosspost@v1
@@ -50,14 +37,14 @@ jobs:
5037
bot-token: ${{ secrets.ANNOUNCER_BOT_TOKEN }}
5138
channel: ${{ env.DISCORD_NEWS_CHANNEL_ID }}
5239
content: |
53-
**__${{ github.event.repository.name }}__** **v${{ env.RELEASE_VERSION }}** *has been released!*
54-
55-
You can view the changes made by viewing the [changelog](<${{ github.event.repository.html_url }}/blob/main/CHANGELOG.txt>) here!
56-
40+
**__${{ github.event.repository.name }}__** **v${{ env.RELEASE_VERSION }}** *has been released!*
41+
42+
You can view the changes made by viewing the [changelog](<${{ github.event.repository.html_url }}/blob/main/CHANGELOG.md>) here!
43+
5744
Go grab the new version from [Wago AddOns](<${{ env.WAGO_URL }}>) or [Curse](<${{ env.CF_URL }}>)!
58-
45+
5946
If you would like to help support the work I do, consider supporting me via the [Discord Shop](https://discord.com/servers/repooc-reforged-1162274244487561216) or the other various ways listed in the [${{env.RR_AUTHOR_SUPPORT_INFO_NAME}}](<${{env.RR_AUTHOR_SUPPORT_INFO_URL}}>) channel.
60-
47+
6148
You can get help for the addon in the [${{env.RR_ADDON_CHANNEL_NAME}}](<${{env.RR_ADDON_CHANNEL_URL}}>) support channel!
6249
- name: Print message id
6350
run: echo "Message id = ${{ steps.publish-to-discord.outputs.message-id }}"

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "ElvUI_KeybindDisplay/Libs/RepoocReforged-1.0"]
2+
path = ElvUI_KeybindDisplay/Libs/RepoocReforged-1.0
3+
url = https://github.com/Repooc/RepoocReforged-1.0

.pkgmeta

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package-as: ElvUI_KeybindDisplay
2+
enable-nolib-creation: no
3+
externals:
4+
ElvUI_KeybindDisplay/Libs/RepoocReforged-1.0:
5+
url: https://github.com/Repooc/RepoocReforged-1.0
26
manual-changelog:
3-
filename: CHANGELOG.txt
4-
markup-type: bbcode
7+
filename: CHANGELOG.md
8+
markup-type: markdown
59
move-folders:
610
ElvUI_KeybindDisplay/ElvUI_KeybindDisplay: ElvUI_KeybindDisplay
11+
enable-toc-creation: yes
File renamed without changes.

ElvUI_KeybindDisplay/Core.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ function KD:Initialize()
186186
hooksecurefunc(E, 'UpdateDB', UpdateDB)
187187
hooksecurefunc(AB, 'FixKeybindText', KD.FixKeybindText)
188188
KD:UpdateButtonDB('PEW')
189+
LibStub('RepoocReforged-1.0'):LoadMainCategory()
189190
end
190191

191192
E.Libs.EP:HookInitialize(KD, KD.Initialize)

ElvUI_KeybindDisplay/ElvUI_KeybindDisplay-Classic.toc

Lines changed: 0 additions & 12 deletions
This file was deleted.

ElvUI_KeybindDisplay/ElvUI_KeybindDisplay-Wrath.toc

Lines changed: 0 additions & 12 deletions
This file was deleted.

ElvUI_KeybindDisplay/ElvUI_KeybindDisplay.toc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
## Interface: 100200
2-
## Title: |cFFFFFFFFKeybind|r|cFF16C3F2Display|r
1+
## Interface: 110000
2+
## Interface-Cata: 40400
3+
## Interface-Classic: 11503
4+
## Title: |cff1784d1ElvUI|r |cff00FF98Keybind|r |cffA330C9Display|r
35
## Author: Repooc
4-
## Version: 1.06
6+
## Version: 1.07
57
## RequiredDeps: ElvUI
68
## DefaultState: Enabled
79
## X-Curse-Project-ID: 557231
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Ui xmlns='http://www.blizzard.com/wow/ui/'>
2+
<Script file="RepoocReforged-1.0\RepoocReforged-1.0.lua" />
3+
</Ui>

ElvUI_KeybindDisplay/Options.lua

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local KD, E, L, V, P, G = unpack(select(2, ...))
2+
local ACH = E.Libs.ACH
23
local AB = E.ActionBars
34

4-
local ACH
55
local selectedHotKey, selectedNewText
66
local tempTextReplacement = {}
77

@@ -43,10 +43,10 @@ local function SetupButtonOptions(barType, binding, numButtons, isPlayerBars)
4343

4444
if isPlayerBars then
4545
HotKey = ACH:Select(L["Button "]..i, nil, i, getValues, nil, nil, getButtonSetting, setButtonSetting)
46-
E.Options.args.kd.args.playerbars.args[barType].args[''..i] = HotKey
46+
KD.Options.args.playerbars.args[barType].args[''..i] = HotKey
4747
else
4848
HotKey = ACH:Select(L["Button "]..i, nil, i, getValues, nil, nil, getButtonSetting, setButtonSetting)
49-
E.Options.args.kd.args[barType].args[''..i] = HotKey
49+
KD.Options.args[barType].args[''..i] = HotKey
5050
end
5151
end
5252
end
@@ -62,7 +62,7 @@ local function AddNewText()
6262
selectedNewText = tempTextReplacement.newText
6363
KD:UpdateButtonDB('PEW')
6464

65-
E.Options.args.kd.args.general.args.textreplacegroup.args.textreplaceoptions.name = format(L["Search for: |cff33ff33%s|r"], selectedHotKey)
65+
KD.Options.args.general.args.textreplacegroup.args.textreplaceoptions.name = format(L["Search for: |cff33ff33%s|r"], selectedHotKey)
6666
tempTextReplacement.originalText = ''
6767
tempTextReplacement.newText = ''
6868
end
@@ -96,7 +96,7 @@ local function TextReplaceGroup()
9696
function(_, value)
9797
selectedHotKey = value
9898
selectedNewText = E.db.kd.replacements[selectedHotKey]
99-
E.Options.args.kd.args.general.args.textreplacegroup.args.textreplaceoptions.name = format(L["Search for: |cff33ff33%s|r"], selectedHotKey)
99+
KD.Options.args.general.args.textreplacegroup.args.textreplaceoptions.name = format(L["Search for: |cff33ff33%s|r"], selectedHotKey)
100100
end, disabled, hidden)
101101

102102
local TextReplaceOptions = ACH:Group('', desc, 8, childGroups, get, set, disabled, function() return selectedHotKey == '' end)
@@ -123,10 +123,15 @@ local function TextReplaceGroup()
123123
end
124124

125125
local function configTable()
126-
ACH = E.Libs.ACH
127-
128126
local kd = ACH:Group('|cFFFFFFFFKeybind|r|cFF16C3F2Display|r', nil, 6, 'tab', nil, nil, function() return not AB.Initialized end)
129-
E.Options.args.kd = kd
127+
local rrp = E.Options.args.rrp
128+
if rrp then
129+
E.Options.args.rrp.args.kd = kd
130+
KD.Options = E.Options.args.rrp.args.kd
131+
else
132+
E.Options.args.kd = kd
133+
KD.Options = E.Options.args.kd
134+
end
130135

131136
local General = ACH:Group(L["General"], nil, 9, 'tree', nil, nil, function() return not AB.Initialized or _G.ElvUI_KeyBinder.active end)
132137
kd.args.general = General
@@ -145,12 +150,12 @@ local function configTable()
145150

146151
for i = 1, 10 do
147152
local Bar = ACH:Group(L["Bar "]..i, nil, i, 'group', nil, nil)
148-
E.Options.args.kd.args.playerbars.args['bar'..i] = Bar
153+
kd.args.playerbars.args['bar'..i] = Bar
149154
end
150155
if E.Retail then
151156
for i = 13, 15 do
152157
local Bar = ACH:Group(L["Bar "]..i, nil, i, 'group', nil, nil)
153-
E.Options.args.kd.args.playerbars.args['bar'..i] = Bar
158+
kd.args.playerbars.args['bar'..i] = Bar
154159
end
155160
end
156161
for bar, values in next, KD.barDefaults do

0 commit comments

Comments
 (0)