Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Pet Nametag #1880

Merged
merged 59 commits into from
Sep 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
18c1a9f
add contributor suffix to nametags
ItsEmpa May 3, 2024
30c90ea
fix wonky island change
ItsEmpa May 4, 2024
4c58c54
make and use entity render nametag event instead
ItsEmpa May 7, 2024
ee0c8f6
forgot to remove that
ItsEmpa May 7, 2024
3b12ae6
use isRealPlayer
ItsEmpa May 8, 2024
3c72be6
changes
ItsEmpa May 8, 2024
a4b9459
Merge branch 'refs/heads/beta' into contributor-nametag
ItsEmpa May 24, 2024
9c15f9e
init
ItsEmpa May 24, 2024
ae1397a
Merge branch 'refs/heads/time-limited-cache-getorput' into contributo…
ItsEmpa May 24, 2024
ee432ec
added cache and made it possible to completely replace the nametag co…
ItsEmpa May 24, 2024
292c2fb
Merge branch 'refs/heads/beta' into contributor-nametag
ItsEmpa May 24, 2024
d785023
accidentally fucked up the merge oops
ItsEmpa May 24, 2024
9d20b9a
added toggle to nametag
ItsEmpa May 24, 2024
3cea1d9
:(
ItsEmpa May 24, 2024
cefdd7e
init
j10a1n15 May 24, 2024
649638d
Merge pull request #54 from ItsEmpa/contributor-nametag
j10a1n15 May 24, 2024
a7c632a
3
ItsEmpa May 24, 2024
8a08dde
Merge pull request #55 from ItsEmpa/feature/pet-nametag-colon-three
j10a1n15 May 24, 2024
8ca14d9
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 May 24, 2024
16c5114
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 May 24, 2024
b59e766
Update PetNametag.kt
j10a1n15 May 25, 2024
2ed204d
fix
j10a1n15 May 25, 2024
0d100e0
pets package
j10a1n15 May 25, 2024
6fd5fea
fix
j10a1n15 May 25, 2024
6a9b72f
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 May 26, 2024
e725799
thank you hypixel
j10a1n15 May 28, 2024
def100d
inline
j10a1n15 May 29, 2024
eeaed9f
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 May 29, 2024
ba4a7a3
Merge branch 'hannibal002:beta' into feature/pet-nametag-3
j10a1n15 Jun 1, 2024
fb05d8a
auto load
j10a1n15 Jun 1, 2024
3cfeeea
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Jun 3, 2024
28533d2
auto loaded
j10a1n15 Jun 3, 2024
b74cf1c
remove private
j10a1n15 Jun 3, 2024
c778a85
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/pet-nametag-3
CalMWolfs Jun 5, 2024
a3dfaa0
2 small thing
CalMWolfs Jun 5, 2024
b060951
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/pet-nametag-3
CalMWolfs Jun 5, 2024
45ee836
resolve
j10a1n15 Jun 5, 2024
218cdc2
fixed hiding logic
j10a1n15 Jun 5, 2024
cfc0edd
improved code to look at
j10a1n15 Jun 5, 2024
5c12eaf
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/pet-nametag-3
CalMWolfs Jun 5, 2024
15a9f5c
fix merge
CalMWolfs Jun 5, 2024
f8d8ddb
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/pet-nametag-3
CalMWolfs Jun 6, 2024
de2eddb
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/pet-nametag-3
CalMWolfs Jun 6, 2024
52ea9f2
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/pet-nametag-3
hannibal002 Jun 14, 2024
cf266cc
Merge branch 'refs/heads/beta' into fork/j10a1n15/feature/pet-nametag-3
hannibal002 Jun 14, 2024
7786c06
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Jun 16, 2024
e45d862
Merge branch 'hannibal002:beta' into feature/pet-nametag-3
j10a1n15 Aug 12, 2024
f5f714b
Merge branch 'hannibal002:beta' into feature/pet-nametag-3
j10a1n15 Aug 12, 2024
2dad1da
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Aug 16, 2024
88e3c5c
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Aug 18, 2024
b0491df
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Aug 21, 2024
64981f1
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Aug 23, 2024
2722fb6
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Aug 26, 2024
0c1be88
Merge branch 'hannibal002:beta' into feature/pet-nametag-3
j10a1n15 Aug 27, 2024
5dbdca8
Merge branch 'refs/heads/beta' into feature/pet-nametag-3
j10a1n15 Sep 1, 2024
7d578f6
Merge branch 'beta' into feature/pet-nametag-3
j10a1n15 Sep 10, 2024
669904f
Merge branch 'beta' into feature/pet-nametag-3
CalMWolfs Sep 11, 2024
f65a827
code cleanup
hannibal002 Sep 11, 2024
8cfbe3b
Merge branch 'beta' into fork/j10a1n15/feature/pet-nametag-3
hannibal002 Sep 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
inline
  • Loading branch information
j10a1n15 committed May 29, 2024
commit def100d3eef88c0f17430ad58d843d694164c5e6
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ class PetNametag {

var text = ""
if (!config.hidePetLevel && (!config.hideMaxPetLevel || lvl == 100 || lvl == 200)) text += "$start "
text += rarity
text += pet + skin
text += rarity + pet + skin

event.chatComponent = text.asComponent()
}
Expand Down
Loading