Commit Graph

343 Commits

Author SHA1 Message Date
Jules
4556259a6b Merge branch '600-unapply-gem-event' into 'master'
UnsocketGemStoneEvent (Fixes #600)

Closes #600

See merge request phoenix-dvpmt/mmoitems!80
2023-06-27 06:23:04 +00:00
Long Pham
e5edc4b486 UnsocketGemStoneEvent (Fixes #600) 2023-06-27 06:23:03 +00:00
Jules
44b0b5e23e Merge branch 'NameDataStackingFix' into 'master'
Fixes stacking issues from items updated by RevID or other forms of...

See merge request phoenix-dvpmt/mmoitems!82
2023-06-27 06:21:44 +00:00
Jules
0245427063 Removed debug message 2023-06-25 23:40:56 +02:00
Jules
1ce86e4861 Musket stats now have placeholders 2023-06-25 18:56:08 +02:00
Jules
2bea05b08c Option to change crossbow sound 2023-06-24 20:03:06 +02:00
Jules
6026602f16 Option to disable arrow consumption 2023-06-24 18:19:34 +02:00
Jules
bae68c5353 Fixed range/arrow vel not working with MMOCore 2023-06-24 18:01:03 +02:00
Jules
3b57b0dd3a Added an option to hide armor trim 2023-06-20 19:26:04 +02:00
Jules
7a1ca884b9 Fixes pre-1.20 support 2023-06-20 19:25:52 +02:00
Jules
9f9e88ea43 Fixed issue with particle edition 2023-06-18 22:47:44 +02:00
Jules
9bb85a2977 Support for armor trims 2023-06-18 18:40:59 +02:00
Jules
f67c6fe6af Removed occurences of #getModifier, fixing issue w/ skill timers 2023-06-18 14:49:40 +02:00
Gunging
837c0cf1b8 Fixes stacking issues from items updated by RevID or other forms of recalculating or regenerating MMOItems.
Once more, might make old items unstackable.
2023-06-01 20:59:48 -05:00
Rosenthalk0
1c350339a4 disable drop stat - with listener as requested in #1289 2023-05-14 19:02:34 -05:00
Jules
516f286d66 Fixed compile error 2023-05-15 00:14:35 +02:00
Jules
df5c8e4791 Merge remote-tracking branch 'origin/jules' into jules 2023-05-14 16:35:28 +02:00
Jules
92529dae30 Support for recent profile API 2023-05-14 16:35:05 +02:00
Jules
eeef8db5ad Supports profiles 2023-05-13 00:38:45 +02:00
Jules
b14f0e590b Fixed forDisplay when canceling recipe in station 2023-05-12 19:16:06 +02:00
Jules
b6d0f76dfb Support for profiles 2023-05-07 23:40:58 +02:00
Ka0rX
7f8afdff65 Modification for ML FormulaParser. 2023-05-06 13:36:16 +01:00
Jules
d619c4b004 Fixed on login NPE 2023-05-03 12:38:19 +02:00
Jules
fca42be9bf Merge remote-tracking branch 'origin/master' 2023-04-23 21:42:41 +02:00
Jules
07229975dd Merge remote-tracking branch 'origin/master' 2023-04-23 14:58:36 +02:00
Jules
3adc7ecc46 Extra comma for ability modifier display 2023-04-23 13:44:03 +02:00
Jules
8073cee347 Fixed -matchlevel 2023-04-23 13:42:08 +02:00
Jules
40e0c9ad21 Fixed an issue with revid rerolling too often 2023-04-23 13:29:38 +02:00
Jules
cb11502189 Fixed an issue with 'disable-removed-items' 2023-04-23 13:26:53 +02:00
Jules
bb9da8870e Merge branch '1200-not-properly-calculating-time-from-crafting-stations-when-cancelling-an-item-crafting' into 'master'
Craft delay calculation patch

See merge request phoenix-dvpmt/mmoitems!65
2023-04-23 10:27:38 +00:00
Jules
cc403091a7 Fixed an issue with revid & item skins 2023-04-22 23:45:55 +02:00
Jules
33ba1828c4 Fixed revid level issue 2023-04-22 15:36:48 +02:00
Jules
44a8534b11 Merge remote-tracking branch 'origin/master' 2023-04-15 22:05:29 +02:00
Jules
03a49d0589 Merge branch '1097_fix_element_cloning' into 'master'
1097_fix_element_when_revid_is_updated_or_stat_data_is_cloned

Closes #1097

See merge request phoenix-dvpmt/mmoitems!73
2023-04-15 19:21:27 +00:00
Jules
68ac7dc5fe Merge branch '1263_priority_repair_reference_fix' into 'master'
1263_repair_references_fix

Closes #1263

See merge request phoenix-dvpmt/mmoitems!72
2023-04-15 19:20:10 +00:00
Jules
3600ce63e4 Spectral arrows are now considered arrows 2023-04-15 21:19:14 +02:00
Jules
d1f2af29c3 Fixed soulbound when disabling 'keep-soulbound-on-death' 2023-04-15 16:58:36 +02:00
Jules
ebe041d8d5 Using most recent double evaluator 2023-04-15 14:35:41 +02:00
Rosenthalk0
2a7f81339e I'm pretty sure that when I changed this a while back, I either messed up the loading or i forgot to fully fix this, but this should fix the issue with the cloning of the items resulting in having a bunch of element stats added to the new Statdata! 2023-04-14 19:07:32 -05:00
Rosenthalk0
2ab60231b0 Fixed the references being the same, allowing for fixed repairing to fix this bug! 2023-04-14 16:12:31 -05:00
Jules
99e893801d Fixed dead link 2023-04-07 14:11:48 +02:00
Jules
3318be847a Fixed an issue with required levels stats 2023-04-07 13:11:26 +02:00
Jules
a179722ee8 Fixed ASkills extra skills 2023-04-07 13:08:03 +02:00
Jules
8462bfd952 Added handler list to CustomDurDamageEvent 2023-04-04 12:49:14 +02:00
Jules
9ea67c5fda Merge remote-tracking branch 'origin/master' 2023-04-04 12:37:58 +02:00
Jules
6c3edb2b37 Merge remote-tracking branch 'origin/master' 2023-04-02 16:16:33 +02:00
Jules
7340bc81e7 Merge branch '1181-issue-with-skin-type-items' into 'master'
Compatible materials stat

See merge request phoenix-dvpmt/mmoitems!64
2023-04-02 14:04:54 +00:00
Jules
e7b807afaa ML now handles custom SkillAPI dmg 2023-04-02 15:50:34 +02:00
Jules
8f8ffd4bca Merge branch '1122-small-bug-arrow-particles-are-very-slightly-offset-above-the-arrow' into 'master'
Arrow particles offset fixed

See merge request phoenix-dvpmt/mmoitems!69
2023-04-02 07:21:11 +00:00
Jules
e698e6f298 Merge branch '1149-crafting-stations-bugged-for-money' into 'master'
Vault refund added

See merge request phoenix-dvpmt/mmoitems!68
2023-04-02 07:20:47 +00:00
Jules
63ca5bb413 Now supports multiple RPG cores at the same time 2023-04-02 00:52:00 +02:00
Jules
147df215f8 Fixed issue saying 'Template Data is not Numeric Stat Formula' 2023-04-01 23:45:50 +02:00
Jules
2290fe7066 Fixed stat placeholder 2023-04-01 23:31:11 +02:00
Jules
78c445bb5a Made stat placeholder more lenient 2023-04-01 23:27:38 +02:00
Jules
4f8577736b Fixed lang3 import 2023-04-01 23:03:36 +02:00
Jules
205c8f3d1b Merge remote-tracking branch 'origin/master' 2023-04-01 15:44:42 +02:00
Jules
934580f23f Update ver nb, removed use of ${revision} 2023-03-27 01:09:48 +02:00
Roch Blonndiaux
d56cd46e97 Bug fixed 2023-03-26 17:52:15 +02:00
Roch Blonndiaux
0aef22ad1e Issue fixed 2023-03-26 17:45:25 +02:00
Roch Blonndiaux
9db368628f Bug patched 2023-03-26 11:50:38 +02:00
Roch Blonndiaux
393c7cfc78 Bug fix 2023-03-25 15:15:50 +01:00
Roch Blonndiaux
75c345483d Optimization 2023-03-25 14:58:48 +01:00
Roch Blonndiaux
27065aa540 Compatible materials stat bug fixed 2023-03-25 14:56:37 +01:00
Roch Blonndiaux
67eae457ca Compatible Materials stat addition 2023-03-25 14:43:51 +01:00
Jules
724eb97b90 Merge branch '752-gen-templates-custom-block-spawning-doesn-t-work-at-all' into 'master'
World generation optimized

See merge request phoenix-dvpmt/mmoitems!57
2023-03-24 23:04:47 +00:00
Jules
eebbf525bd Fixed message translations 2023-03-25 00:02:41 +01:00
Jules
a4afdda628 Updated repair type description 2023-03-19 15:20:08 +01:00
Jules
ace0d26a89 Fixed repair type 2023-03-19 15:17:23 +01:00
Jules
3a10bb1b39 Support for other AS stats 2023-03-19 12:53:48 +01:00
Roch Blonndiaux
b138c0dcc9 Some more optimization & runnable -> block populator 2023-03-14 15:47:16 +01:00
Roch Blonndiaux
7f0b29fd28 Final optimization 2023-03-13 17:59:27 +01:00
Roch Blonndiaux
9be8d9eb18 Optimization concept 2023-03-13 16:41:14 +01:00
Jules
5f1e32d581 Removed useless async task 2023-03-09 18:45:43 +01:00
Jules
73e4f60482 Fixed an issue with item set permissions 2023-03-09 18:25:43 +01:00
Jules
d42e35847a Merge remote-tracking branch 'origin/master' 2023-03-09 17:26:23 +01:00
Jules
1339af2604 Cleanup 2023-03-03 15:06:13 +01:00
Gunging
23ad7e7517 Fixes RevID Updates clearing stats granted by GemStones
Allows RevID Updater to update gemstones inserted in items, so they have the stats of the template, without having to take them out and put it back in again.
2023-02-15 14:03:28 -06:00
Jules
69f9c89959 Update lib ver 2023-02-01 21:28:38 +01:00
Jules
573a957446 Crowdin support 2023-01-25 21:24:26 +01:00
Jules
56bc8ba551 Merge remote-tracking branch 'origin/master' 2023-01-25 18:19:34 +01:00
Jules
207411fc87 Fixed validation error on crossbows 2023-01-25 14:51:00 +01:00
Jules
d11cee182d Fixed percent repair power 2023-01-25 14:47:35 +01:00
Taner
124f441ccd Revert "Update DoubleStat.java"
This reverts commit 79cea0c65a
2023-01-14 06:46:41 +00:00
Taner
79cea0c65a Update DoubleStat.java 2023-01-14 06:42:16 +00:00
Roch Blonndiaux
ce4fbf6321 Reload & code cleanup 2023-01-11 14:44:49 +01:00
Roch Blonndiaux
e442d030ad Lore option & some more documentation 2023-01-11 13:48:52 +01:00
Roch Blonndiaux
85ebca48dc Custom stats 2023-01-11 13:14:10 +01:00
Indyuce
45d935f498 Removed debug msg 2022-12-29 14:57:20 +01:00
Indyuce
94f70d4644 Cleaned up item reforger 2022-12-29 14:35:02 +01:00
Indyuce
1a5dcbc830 Fixed placeholders 2022-12-29 14:11:09 +01:00
Indyuce
2123f9f430 OP stats that no one can edit. 2022-12-26 00:56:00 +01:00
Indyuce
1b4966926e Removed last use of components 2022-12-26 00:53:39 +01:00
Indyuce
10362c358b Hide modifiers in GUIs 2022-12-23 12:40:42 +01:00
Indyuce
0993b6face Merged adventure 2022-12-23 00:13:45 +01:00
Indyuce
6650527584 Compiles on java 8 2022-12-22 23:06:38 +01:00
Indyuce
b53a21dbe5 Removed use of components 2022-12-22 16:12:18 +01:00
Roch Blonndiaux
f070ebd1c4 Merge conflicts resolved 2022-12-22 14:46:37 +01:00
Indyuce
b9b61b1616 Merge remote-tracking branch 'origin/adventure-like-impl'
# Conflicts:
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/util/crafting/CraftingRecipeDisplay.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
2022-12-22 12:30:40 +01:00
Indyuce
192f997ff3 Fixed the 'placeholder' recipe condition 2022-12-22 00:24:08 +01:00
Indyuce
021813b57e Fixed item set particles 2022-12-22 00:02:55 +01:00
Indyuce
1120222e91 FIxed 'amount' in MI trigger 2022-12-21 19:11:26 +01:00
Roch Blonndiaux
129a51a9a9 Kyori adventure methods replacement 2022-12-21 11:58:25 +01:00
Roch Blondiaux
46fc12fee6 Merge branch 'master' into 'adventure-like-impl'
# Conflicts:
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/util/crafting/CraftingRecipeDisplay.java
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
2022-12-21 10:54:34 +00:00
Indyuce
dc27148c30 Fixed wave lute eff 2022-12-21 00:22:21 +01:00
Indyuce
0bb66bd2b2 Fixed projectile particles for lutes 2022-12-21 00:19:51 +01:00
Indyuce
76877b0eb6 Fixed /mi list 2022-12-21 00:19:37 +01:00
Indyuce
e97036ab7b Custom repairs are now comp with MMOCore 2022-12-20 12:25:44 +01:00
Indyuce
640fc62119 Fixed an issue with ornaments; improved comp with MMOInv 2022-12-17 16:46:16 +01:00
Indyuce
39b10b8af8 Merge remote-tracking branch 'origin/adventure-like-impl'
# Conflicts:
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/util/crafting/CraftingRecipeDisplay.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
2022-12-17 14:14:28 +01:00
Indyuce
ffb83a64f9 Merge remote-tracking branch 'origin/1007-stations-hex-problem' 2022-12-15 12:25:58 +01:00
Indyuce
54a049e64f Merge remote-tracking branch 'origin/926-hex-colors-not-working-with-tier-color' 2022-12-15 12:25:40 +01:00
Indyuce
59f1b4261b Merge remote-tracking branch 'origin/1018-playerjoinevent'
# Conflicts:
#	MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/ItemListener.java
2022-12-15 12:24:23 +01:00
Roch Blonndiaux
0c2a5f2514 Italic issue fixed 2022-12-13 15:45:36 +01:00
Roch Blonndiaux
b2fd6d8834 Craft station preview items patched 2022-12-08 17:06:43 +01:00
Roch Blonndiaux
96d02969fd Stations name placeholders patched 2022-12-08 16:33:13 +01:00
Roch Blonndiaux
d2ad83e218 Stations name update 2022-12-07 16:05:54 +01:00
Roch Blonndiaux
5e55049369 Tier placeholders fix 2022-12-07 15:59:27 +01:00
Roch Blonndiaux
192804f504 Adventure parser implementation 2022-12-07 14:58:50 +01:00
Indyuce
de7eb81ddf Fixed 'silent' param in /mi give 2022-12-02 17:49:04 +01:00
Indyuce
4a4227fe97 Fixed citizens dep 2022-11-14 10:56:11 +01:00
Roch Blonndiaux
6ea953702d Item type mini message format fixed 2022-11-09 17:35:08 +01:00
Roch Blonndiaux
d6017a4e88 Debug removed 2022-11-09 17:24:32 +01:00
Roch Blonndiaux
1878e7eb5c <tier-color> fixed 2022-11-09 17:02:29 +01:00
Roch Blonndiaux
5ed21155ea <tier-name> fixed 2022-11-09 16:50:25 +01:00
Roch Blonndiaux
077a4ce0ef <tier-color-cleaned> fixed 2022-11-09 16:43:26 +01:00
Indyuce
ecf8fda224 Kilos fix on gem stone dupe 2022-11-07 17:24:31 +01:00
Roch Blonndiaux
1bef5fa21e Bug fixed :))) 2022-11-07 12:47:36 +01:00
Roch Blonndiaux
bcdba5ca5d Event priority updated 2022-11-06 13:15:12 +01:00
Indyuce
23df2dfe2d More cleaning up 2022-11-05 13:31:39 +01:00
Indyuce
d2f144c4ed Removed recipe edition lore line 2022-11-05 13:14:49 +01:00
Indyuce
bb7ac9307a Recipe cleanup 2022-11-05 13:11:19 +01:00
Indyuce
1471923a2c Removed unused legacy custom recipes 2022-11-05 12:45:00 +01:00
Indyuce
29e38bd4a0 Removed func with string list stats till better implementation 2022-11-05 11:46:15 +01:00
Indyuce
39d68cfd74 Fixed an issue with action bar messages 2022-11-04 15:11:09 +01:00
Indyuce
a48041b756 Fixed an issue with custom dur 2022-11-04 14:33:17 +01:00
Indyuce
1eb8bde5d4 Fixed DeathDowngrading MiniMessage format support 2022-11-04 12:17:38 +01:00
Indyuce
555c6e2284 Cleaned up custom block breaking 2022-11-03 19:12:00 +01:00
Indyuce
b62b303d5c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/ItemListener.java
2022-11-03 18:11:32 +01:00
Indyuce
2e6bae16b5 Fixed shulker missile not working 2022-11-03 18:06:29 +01:00
Jules
aaa192d5d5 Merge branch '910-using-gems-on-items-with-elemental-attribute-makes-the-item-lose-the-elemental-attribute' into 'master'
Fixed Elements' Tag - 910, 964, possibly 943, 1033, 899!

Closes #964 and #910

See merge request phoenix-dvpmt/mmoitems!27
2022-11-03 17:03:38 +00:00
Jules
34f102fd3c Merge branch '725-repair-percent-is-not-work' into 'master'
Vanilla & MMOItems items durability % fixed

See merge request phoenix-dvpmt/mmoitems!19
2022-11-03 16:59:26 +00:00
Indyuce
0da5c6877c Merge remote-tracking branch 'origin/1019-bug-config-option-item-revision-keep-data-reroll-doesn-t-work'
# Conflicts:
#	.gitignore
2022-11-03 17:56:26 +01:00
Jules
d1ed762288 Merge branch 'elemental-damage-stacking-error-fix' into 'master'
Fixes Stacking of Elements' Double Values - Noticed during fix of Elements tag testing!

See merge request phoenix-dvpmt/mmoitems!30
2022-11-03 16:53:07 +00:00
Jules
5d02cb8ad1 Delete MMOItems-API.iml 2022-11-03 16:07:29 +00:00
Indyuce
c095ecaa91 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitignore
#	MMOItems-API/MMOItems-API.iml
#	MMOItems-Dist/MMOItems-Dist.iml
2022-11-03 17:06:08 +01:00
Indyuce
67b37ee875 Fixed gitignore 2022-11-03 17:04:59 +01:00
Rosenthalk0
c750355383 Fixes Stacking of Elements' Double Values - Noticed during fix of Elements tag testing! 2022-10-25 15:19:23 -05:00
KingKilo
5824f6a3fe Fixed Elements 2022-10-25 19:32:00 +00:00
Jules
d4a30f90f6 Merge branch 'dev' into 'master'
Code cleanup & mythiclibs elements loaded as stats

See merge request phoenix-dvpmt/mmoitems!24
2022-10-25 16:28:18 +00:00
Roch
7ceaa39c99 Error fixed 2022-10-25 14:03:11 +02:00
Roch
99c4464e4d Mana cost state implemented 2022-10-25 13:09:45 +02:00
Roch
47ff6fba42 MMOItems durability % fixed 2022-10-24 16:49:32 +02:00
Roch
a76bc04386 Issue fixed 2022-10-24 16:02:50 +02:00
Roch
932c35939a MythicLibs elements not working fixed
https://discord.com/channels/369891772010070021/1024797398612054026
2022-10-24 15:22:23 +02:00
Roch
7ad18474f6 Cleanup 2022-10-24 14:10:39 +02:00
Roch
04c2756a8c Repair power placeholder fixed 2022-10-24 12:45:55 +02:00
Roch
5e32f4cefb Code cleanup 2022-10-21 14:36:15 +02:00
Roch
67c7add6a7 Quick cleanup 2022-10-21 13:53:23 +02:00
Indyuce
b141af1bcc Merge remote-tracking branch 'origin/master' 2022-10-16 21:59:23 +02:00
Indyuce
69d3f8a962 Added s placeholder to item cd message 2022-10-16 21:59:19 +02:00
Jules
59cb8594b4 Fixed an issue with skill loading 2022-10-15 12:55:57 +02:00
Indyuce
07078ef0cf More stats being unavailable to catalysts 2022-10-02 13:18:35 +02:00
Indyuce
ec8df89870 Catalysts are now upgradable 2022-10-02 13:15:22 +02:00
Indyuce
2fbc935c52 'Potion effects' no longer show for tipped arrows 2022-10-02 13:05:15 +02:00
Indyuce
dfa13fe137 Fixed unidentified items not display item tier 2022-10-02 13:04:53 +02:00
Indyuce
4cba417cce Fixed arrow potion effects 2022-10-02 12:36:47 +02:00
Indyuce
3b57c527b5 /mi take 2022-10-01 21:42:32 +02:00
Indyuce
16a0a1ae14 MI player data now uncached on logout 2022-09-20 18:06:25 +02:00
Indyuce
ad5d16b0b0 Fixed an issue with MI bow tension 2022-09-16 01:37:40 +02:00
Indyuce
211afef21b Small method change 2022-09-16 01:30:59 +02:00
Indyuce
4381878f9a Fixed default stat files 2022-08-20 20:27:23 +02:00
Indyuce
d6dfe66e84 Improved support for Vault 2022-08-20 20:26:16 +02:00
Indyuce
75fe7a737b Improved support for Vault 2022-08-20 20:25:39 +02:00
Indyuce
5a0f51331c New stats to increase MMOCore attributes 2022-08-19 14:59:32 +02:00
Indyuce
a3e22eda66 Now relies on ML item glow 2022-08-19 13:52:23 +02:00
Indyuce
28dd0cb67c Improved item tier capacity input 2022-08-19 12:13:18 +02:00
Indyuce
081d14c252 Improved placeholder calculation 2022-08-19 11:11:23 +02:00
Indyuce
7e25308dfd Removed useless calls of parseColors() 2022-08-18 23:31:08 +02:00
Indyuce
2ab667e979 Deprecate more stuff 2022-08-18 23:17:13 +02:00
Indyuce
db78c8d9c3 Changed to ML placeholder parser 2022-08-18 23:15:39 +02:00
Indyuce
9367fb1d20 Fixed armor applying stats in hand 2022-08-18 22:34:19 +02:00
Indyuce
b89734a211 Fixed modifier application 2022-08-18 15:51:40 +02:00
Indyuce
dbd1936609 Fixed modifier application 2022-08-18 12:48:50 +02:00
Indyuce
4706dd0ac0 Better definitions for MMOItem class 2022-08-18 11:24:04 +02:00
Indyuce
df6e916d4a Better definitions for MMOItem class 2022-08-18 11:05:06 +02:00
Indyuce
6d94bee39b Fixed an issue with stat application 2022-08-18 00:29:11 +02:00
Indyuce
9689bfb7b0 New both_catalyst item type 2022-08-18 00:28:53 +02:00
Indyuce
13dec22e5f Fixed elements 2022-08-17 19:35:18 +02:00
Indyuce
d716fddbd4 Improved imports 2022-08-17 18:09:27 +02:00
Indyuce
81408d8e2f Changed method name 2022-08-17 18:08:54 +02:00
Indyuce
4be6d7f1f8 Fixed an issue with mmocore player data loading 2022-08-17 17:54:46 +02:00
Indyuce
e119664c0b Better obj definition for item types 2022-08-17 00:57:00 +02:00
Indyuce
706ddf6f1f Modules 2022-08-16 12:39:43 +02:00