9
0
mirror of https://github.com/Auxilor/Reforges.git synced 2025-12-19 15:09:23 +00:00

Compare commits

...

318 Commits

Author SHA1 Message Date
Will FP
24f45a729f libreforge-updater 2025-10-06 08:56:44 +01:00
Will FP
2bd9f98828 Updated to use tags in targets to add copper support 2025-10-05 16:04:18 +01:00
Will FP
2eb1d079b9 libreforge-updater 2025-09-11 09:58:17 +01:00
Will FP
772d0b798b libreforge-updater 2025-08-01 10:04:01 +01:00
Will FP
c69804cae4 libreforge-updater 2025-07-05 16:45:06 +01:00
Will FP
0cd50135a1 libreforge-updater 2025-07-04 09:50:31 +01:00
Will FP
ae10d11a0d libreforge-updater 2025-03-29 14:21:57 +00:00
Will FP
a86c02da3e libreforge-updater 2025-01-31 11:54:28 +00:00
Will FP
be9fbf9d56 libreforge-updater 2025-01-25 13:49:41 +00:00
Will FP
19856fe31b Fix 2025-01-25 13:47:31 +00:00
Will FP
4bcfdb17c3 libreforge-updater 2025-01-25 13:45:39 +00:00
Will FP
dd42a42c0f libreforge-updater 2024-11-06 18:32:26 +00:00
Will FP
bc33fb9e52 libreforge-updater 2024-10-22 12:13:40 +01:00
Will FP
b3713a2fc4 libreforge-updater 2024-09-22 16:59:43 +01:00
Auxilor
7338ea3259 libreforge-updater 2024-09-02 11:30:38 +01:00
Auxilor
c24567bdd9 libreforge-updater 2024-08-30 17:25:37 +01:00
Auxilor
14ac6a7d7c libreforge-updater 2024-08-29 12:09:49 +01:00
Auxilor
d82eabc304 libreforge-updater 2024-08-23 15:35:55 +01:00
Auxilor
53005f6f61 libreforge-updater 2024-08-21 18:59:03 +01:00
Auxilor
445d7b6a11 libreforge-updater 2024-08-15 15:08:17 +01:00
Auxilor
8bcaf8f0b2 libreforge-updater 2024-08-03 13:42:03 +01:00
Auxilor
c74b3c0e59 libreforge-updater 2024-07-25 10:05:04 +01:00
Auxilor
e23ec1f90c libreforge-updater 2024-07-21 12:19:52 +01:00
Auxilor
e449268b3a Removed @ConfigUpdater 2024-07-21 11:58:52 +01:00
Auxilor
6b31417bab Updated display module loading 2024-07-20 15:28:45 +01:00
Auxilor
58d5b26848 Updated tags 2024-07-20 15:28:31 +01:00
Auxilor
b2a9c250c7 Added item tag for reforged items 2024-07-20 14:12:29 +01:00
Auxilor
371eb4e6c0 Added item tag for stones 2024-07-20 14:12:16 +01:00
Auxilor
9424cc0475 libreforge-updater 2024-07-19 20:29:10 +01:00
Auxilor
c9230bd61f libreforge-updater 2024-07-18 13:24:44 +01:00
Auxilor
c3c55ad862 libreforge-updater 2024-07-16 17:14:14 +01:00
Auxilor
533c86b7fd libreforge-updater 2024-07-13 20:45:46 +01:00
Auxilor
214f693a16 libreforge-updater 2024-07-08 15:58:56 +01:00
Auxilor
015042c754 libreforge-updater 2024-07-05 13:03:12 +01:00
Auxilor
95ab511716 libreforge-updater 2024-07-03 17:44:28 +01:00
Auxilor
7f02a89b50 libreforge-updater 2024-06-29 16:44:27 +01:00
Auxilor
60002bb33c libreforge-updater 2024-06-28 15:56:48 +01:00
Auxilor
520a783b95 libreforge-updater 2024-06-27 18:54:57 +01:00
Auxilor
24eb69398f libreforge-updater 2024-06-26 16:52:45 +01:00
Auxilor
2251227fd8 libreforge-updater 2024-06-25 15:14:26 +01:00
Auxilor
6488aac611 libreforge-updater 2024-06-24 15:07:06 +01:00
Auxilor
5ef604c464 Updated to Java 21 2024-06-24 13:53:32 +01:00
Auxilor
063dc05b4e libreforge-updater 2024-06-23 17:27:12 +01:00
Auxilor
b8bd4375a9 libreforge-updater 2024-06-23 13:21:14 +01:00
Will FP
51ddca9b85 libreforge-updater 2024-05-31 20:37:05 +01:00
Will FP
0ecdc49a13 libreforge-updater 2024-05-11 18:20:48 +01:00
Will FP
61676fe568 libreforge-updater 2024-04-17 20:34:11 +01:00
Auxilor
56e0c05043 libreforge-updater 2024-04-15 18:20:29 +01:00
Auxilor
791161fa3a libreforge-updater 2024-04-11 13:18:35 +01:00
Auxilor
ce332651b2 libreforge-updater 2024-03-29 16:09:18 +00:00
Will FP
4eedabd5cb libreforge-updater 2024-03-11 17:37:21 +00:00
Will FP
91daaf053f libreforge-updater 2024-03-10 20:08:38 +00:00
Will FP
66bbcb9d87 libreforge-updater 2024-03-02 15:19:58 +00:00
Will FP
504998a78d libreforge-updater 2024-02-22 13:17:39 +00:00
Will FP
18a5abbc57 libreforge-updater 2024-02-15 13:01:53 +00:00
Will FP
b3ec0a487b libreforge-updater 2024-02-08 19:48:45 +00:00
Will FP
e40d4f666f libreforge-updater 2024-01-30 11:26:40 +00:00
Will FP
37083c9980 Updated to 6.54.5 2024-01-20 15:49:38 +00:00
Will FP
f7bee746e2 Merge pull request #36
Fixed TargetYml#getSlot
2024-01-20 15:49:27 +00:00
Will FP
7fb5bfc895 libreforge-updater 2024-01-18 17:02:26 +00:00
Will FP
26765564ea 6.54.3 2024-01-17 13:05:45 +00:00
often
2ba6e6f9f3 Fixed TargetYml#getSlot 2024-01-16 18:04:40 +03:00
Will FP
ef8c85c722 libreforge-updater 2024-01-16 13:28:38 +00:00
Will FP
0889efd92c Fix 2024-01-14 15:55:10 +00:00
Will FP
5cd66bc797 libreforge-updater 2024-01-13 14:23:25 +00:00
Will FP
332356fc50 libreforge-updater 2024-01-07 13:51:08 +00:00
Will FP
f8ca89e607 Reforges now uses the slot system 2024-01-06 15:19:42 +00:00
Will FP
94c4d354db libreforge-updater 2024-01-06 09:19:20 +00:00
Auxilor
0a7ef0b65a libreforge-updater 2024-01-04 17:26:18 +00:00
Auxilor
1df223c741 Fixed compile bug 2024-01-01 20:04:30 +00:00
Auxilor
db5c627f4d libreforge-updater 2024-01-01 20:03:31 +00:00
Will FP
f0a6a4c9b8 libreforge-updater 2023-12-27 14:16:44 +01:00
Will FP
d9296cca53 libreforge-updater 2023-12-24 14:54:24 +01:00
Auxilor
534c8a6018 libreforge-updater 2023-12-20 15:59:05 +00:00
Will FP
5b48c4f159 libreforge-updater 2023-12-14 16:12:57 +00:00
Will FP
cc98189027 libreforge-updater 2023-12-11 12:12:20 +00:00
Will FP
8fa7d145ac Merge pull request #34 from PQguanfang/patch-1
Update custom item register ID
2023-12-11 11:39:16 +00:00
Will FP
a89a6503ad libreforge-updater 2023-12-07 17:25:03 +00:00
Will FP
1c10a2fbe4 libreforge-updater 2023-12-03 15:58:35 +00:00
Will FP
7bc6afdf43 libreforge-updater 2023-11-30 14:26:55 +00:00
Will FP
3725e55f43 libreforge-updater 2023-11-26 23:24:08 +00:00
Will FP
3cbc54429e libreforge-updater 2023-11-23 13:21:00 +00:00
Auxilor
068b9b1cdb libreforge-updater 2023-11-21 22:41:08 +00:00
Auxilor
43cfa1ab9f libreforge-updater 2023-11-19 14:13:53 +00:00
Auxilor
d68c7b1f43 libreforge-updater 2023-11-17 19:01:58 +00:00
Auxilor
1a14a11aa4 libreforge-updater 2023-11-11 17:58:28 +00:00
Auxilor
ff3af6b412 Added support for item placeholders 2023-11-11 15:00:10 +00:00
Auxilor
7bd43e6506 Updated not-met-lines 2023-11-11 14:51:25 +00:00
Auxilor
89c9935801 libreforge-updater 2023-11-10 13:58:55 +00:00
Auxilor
e15d6be301 libreforge-updater 2023-11-05 13:41:30 +00:00
PQguanfang
eaba6c24a8 Update custom item register ID
This register ID will lead to reforge stone has the second : symbol, like:
reforges:stone_reforges:bleed

This will lead to reforge stone will never be able to use in eco's Item lookup feature, this PR is fixing this problem.
2023-11-05 20:20:31 +08:00
Auxilor
d75a301cfa libreforge-updater 2023-10-30 13:30:36 +00:00
Auxilor
319afce452 Updated to 6.38.0 2023-10-30 13:10:08 +00:00
Auxilor
8932593683 Added on-reforge-effects 2023-10-30 13:08:17 +00:00
Auxilor
3fa95a5576 libreforge-updater 2023-10-28 14:15:02 +01:00
Auxilor
b5ec89f5d4 libreforge-updater 2023-10-24 15:38:58 +01:00
Auxilor
508c1e1d66 libreforge-updater 2023-10-19 12:52:05 +01:00
Auxilor
d921254584 libreforge-updater 2023-10-14 14:20:03 +01:00
Auxilor
2160fb5acc libreforge-updater 2023-10-14 14:18:36 +01:00
Auxilor
536b1d9dbf libreforge-updater 2023-10-02 11:53:15 +01:00
Auxilor
cef4abcfad libreforge-updater 2023-09-26 14:44:39 +01:00
Auxilor
7414ce787a libreforge-updater 2023-09-20 15:33:22 +01:00
Auxilor
d90fcc0d1a libreforge-updater 2023-09-17 11:19:45 +01:00
Auxilor
84e02044e1 libreforge-updater 2023-09-13 15:08:18 +01:00
Auxilor
19097fb7b5 libreforge-updater 2023-09-07 16:02:18 +01:00
Auxilor
8d86487eb6 libreforge-updater 2023-09-02 17:35:05 +01:00
Auxilor
32bf727816 libreforge-updater 2023-08-31 17:00:06 +01:00
Auxilor
023ae3d10e libreforge-updater 2023-08-30 11:32:02 +01:00
Auxilor
070b95eb94 libreforge-updater 2023-08-26 18:12:06 +01:00
Auxilor
a65f5add37 libreforge-updater 2023-08-23 15:32:20 +01:00
Auxilor
31a7b0f62f libreforge-updater 2023-08-19 15:33:14 +01:00
Auxilor
b11e34e823 libreforge-updater 2023-08-15 18:50:44 +01:00
Auxilor
cabae5c469 libreforge-updater 2023-08-13 14:43:13 +01:00
Auxilor
c930b89c8d libreforge-updater 2023-08-10 19:59:51 +01:00
Auxilor
9a6945c824 libreforge-updater 2023-08-10 19:57:59 +01:00
Auxilor
10a2e9ca7f libreforge-updater 2023-08-09 15:59:01 +01:00
Auxilor
22b18f7b24 libreforge-updater 2023-08-09 14:40:56 +01:00
Auxilor
a09444f3c0 libreforge-updater 2023-08-09 14:37:55 +01:00
Auxilor
df7e85e27b libreforge-updater 2023-08-08 17:59:49 +01:00
Auxilor
35ceb4bc68 libreforge-updater 2023-08-05 21:07:31 +01:00
Auxilor
89ecd11695 libreforge-updater 2023-07-27 15:22:05 +01:00
Auxilor
7b3b287f71 libreforge-updater 2023-07-27 15:19:05 +01:00
Auxilor
3f55d5a141 libreforge-updater 2023-07-25 14:38:46 +01:00
Auxilor
d2a925ec3e libreforge-updater 2023-07-23 11:40:52 +01:00
Auxilor
4e3128840f libreforge-updater 2023-07-22 15:00:01 +01:00
Auxilor
4074531b01 libreforge-updater 2023-07-21 12:33:26 +01:00
Auxilor
f506b10552 libreforge-updater 2023-07-20 13:07:15 +01:00
Auxilor
69e0ed176d libreforge-updater 2023-07-19 14:15:07 +01:00
Auxilor
31464a7ff7 libreforge-updater 2023-07-17 18:32:44 +01:00
Auxilor
182b4a354a libreforge-updater 2023-07-16 13:33:34 +01:00
Auxilor
d9315dfda9 libreforge-updater 2023-07-12 13:07:25 +01:00
Auxilor
4270804b1b libreforge-updater 2023-07-09 17:25:10 +01:00
Auxilor
ce7922ebfd libreforge-updater 2023-07-06 18:47:19 +01:00
Auxilor
abf4b71271 libreforge-updater 2023-07-04 14:50:10 +01:00
Auxilor
6e388e0372 libreforge-updater 2023-06-27 10:42:11 +01:00
Auxilor
be8bdf6b48 libreforge-updater 2023-06-21 10:22:53 +01:00
Auxilor
3884a8859c libreforge-updater 2023-06-19 11:11:57 +02:00
Will FP
d898448e35 Create CODEOWNERS 2023-06-17 21:22:29 +02:00
Auxilor
115aa6af07 libreforge-updater 2023-06-10 13:32:58 +01:00
Auxilor
a3dd390dc4 libreforge-updater 2023-06-05 16:26:19 +01:00
Auxilor
23ac0ee77c Fixed Publications 2023-06-03 18:02:25 +01:00
Auxilor
b6dbb08a00 libreforge-updater 2023-06-03 15:45:05 +01:00
Auxilor
58eb7b482c libreforge-updater 2023-06-01 12:33:04 +01:00
Auxilor
6ca8bbe3ab libreforge-updater 2023-05-30 16:10:13 +01:00
Auxilor
6da6cb84f0 libreforge-updater 2023-05-24 14:57:42 +01:00
Auxilor
a60cf095c0 libreforge-updater 2023-05-23 16:11:23 +01:00
Auxilor
ef9cb40e36 libreforge-updater 2023-05-20 17:40:30 +01:00
Auxilor
eea580b3c7 libreforge-updater 2023-05-18 16:25:10 +01:00
Auxilor
36d0c4048d libreforge-updater 2023-05-17 15:56:52 +01:00
Auxilor
782b4b4fe4 libreforge-updater 2023-05-16 20:29:56 +01:00
Auxilor
55b259360a libreforge-updater 2023-05-15 10:52:16 +01:00
Auxilor
18adf6fce6 libreforge-updater 2023-05-14 13:08:13 +01:00
Auxilor
7f07c4805d libreforge-updater 2023-05-09 17:45:12 +01:00
Auxilor
4529de3711 libreforge-updater 2023-05-05 18:54:19 +01:00
Auxilor
c723384060 libreforge-updater 2023-05-03 14:47:36 +01:00
Auxilor
4f40b69d64 libreforge-updater 2023-04-30 19:56:45 +01:00
Auxilor
14af73dbe4 libreforge-updater 2023-04-29 17:18:58 +01:00
Auxilor
bbae779308 libreforge-updater 2023-04-25 16:05:51 +01:00
Auxilor
d049430007 libreforge-updater 2023-04-25 13:12:59 +01:00
Auxilor
0d20247aa1 libreforge-updater 2023-04-24 22:48:49 +01:00
Auxilor
a9ed6d23cc libreforge-updater 2023-04-20 20:21:28 +01:00
Auxilor
38cf28faa9 libreforge-updater 2023-04-19 12:22:30 +01:00
Auxilor
f7a77351c7 libreforge-updater 2023-04-13 12:48:31 -04:00
Auxilor
28075b9ace libreforge-updater 2023-04-09 18:19:09 -04:00
Auxilor
4ce594c7ee libreforge-updater 2023-04-06 20:09:08 +02:00
Auxilor
18a793de8d libreforge-updater 2023-04-05 13:14:32 +01:00
Auxilor
f31ae82e61 libreforge-updater 2023-04-03 17:50:33 +01:00
Auxilor
4616fa0d88 libreforge-updater 2023-04-02 17:44:50 +01:00
Auxilor
16dd116151 libreforge-updater 2023-03-30 15:30:06 +01:00
Auxilor
d4451542d8 libreforge-updater 2023-03-29 19:20:49 +01:00
Auxilor
772c1d444c libreforge-updater 2023-03-29 15:46:54 +01:00
Auxilor
d4effa1cb9 Moved to repo.auxilor.io 2023-03-29 13:48:28 +01:00
Auxilor
120c0d17cb Fixed permissions on paper 2023-03-28 21:44:20 +01:00
Auxilor
f2b52cddb3 Moved integration 2023-03-28 19:17:36 +01:00
Auxilor
b4c70a5e11 Fixed reforge GUI 2023-03-28 17:20:56 +01:00
Auxilor
0b6652ef4e Fixed several bugs 2023-03-28 16:05:52 +01:00
Auxilor
f3d1670e6c Fixed publications 2023-03-28 14:57:45 +01:00
Auxilor
0628d37e78 Fixed publications 2023-03-28 14:57:24 +01:00
Auxilor
b91e859006 Fixed caffeine 2023-03-27 18:43:17 +01:00
Auxilor
47c5f10a38 Updated to libreforge 4 2023-03-27 18:19:17 +01:00
Auxilor
7f6bc16fdb Updated to 5.81.7 2023-03-22 22:17:12 +00:00
Auxilor
1251747546 libreforge-updater 2023-03-13 13:39:38 +00:00
Auxilor
430e6c94ef libreforge-updater 2023-03-02 12:55:10 +00:00
Auxilor
436e4e0401 Fixed dependencies 2023-02-25 17:43:03 +00:00
Auxilor
54280f7cfe libreforge-updater 2023-02-22 15:01:51 +00:00
Auxilor
ac215d1d70 libreforge-updater 2023-02-15 20:58:04 +00:00
Auxilor
f5044fa941 libreforge-updater 2023-02-12 16:54:56 +00:00
Auxilor
0ebdbdb6bd libreforge-updater 2023-02-09 14:11:53 +00:00
Auxilor
4066a28173 libreforge-updater 2023-02-07 14:46:05 +00:00
Auxilor
53ae1d13f3 libreforge-updater 2023-02-04 15:35:57 +00:00
Auxilor
e703056fcd libreforge-updater 2023-01-24 10:08:51 +00:00
Will FP
1d49e6184f Merge pull request #31 from 0ft3n/master
Fixed support for stacked reforge stones in the GUI
2023-01-24 09:42:19 +00:00
_OfTeN_
afdbf84fe1 Fixed support for stacked reforge stones in the GUI 2023-01-24 00:19:24 +03:00
Auxilor
5f71cb216d libreforge-updater 2023-01-17 16:47:54 +00:00
Auxilor
01d6cbc178 libreforge-updater 2023-01-13 18:07:56 +00:00
Auxilor
58361d04bf libreforge-updater 2023-01-07 12:18:53 +00:00
Auxilor
d9890f256c libreforge-updater 2023-01-02 15:59:32 +00:00
Auxilor
90da9117a2 libreforge-updater 2022-12-26 14:00:53 +01:00
Auxilor
cdddc7acdf libreforge-updater 2022-12-20 15:16:36 +00:00
Auxilor
9f5000f9d3 libreforge-updater 2022-12-12 14:00:47 +00:00
Auxilor
2b20d2c540 libreforge-updater 2022-12-09 17:01:06 +00:00
Auxilor
94ec760fbf libreforge-updater 2022-12-05 10:50:18 +00:00
Auxilor
73fc667dee libreforge-updater 2022-11-30 17:38:08 +00:00
Auxilor
d2f6e6cb9f libreforge-updater 2022-11-27 21:44:18 +00:00
Auxilor
4f489cc018 libreforge-updater 2022-11-26 19:20:12 +00:00
Auxilor
a96d08d4be libreforge-updater 2022-11-24 14:30:01 +00:00
Auxilor
fdd95f005f libreforge-updater 2022-11-23 17:24:59 +00:00
Auxilor
aec6639725 libreforge-updater 2022-11-21 16:02:42 +00:00
Auxilor
b3f98e2b6e libreforge-updater 2022-11-17 08:38:19 +00:00
Auxilor
8b2c96dc53 libreforge-updater 2022-11-12 17:34:16 +00:00
Auxilor
192bb138ff Final touches to GUI 2022-11-09 15:23:57 +00:00
Auxilor
1dc15fcb53 Updated to ecomponent 1.3.0 2022-11-09 15:07:18 +00:00
Auxilor
94394ecaec Updated to ecomponent 1.2.0 2022-11-09 14:37:47 +00:00
Auxilor
0cf2d4c810 Fix 2022-11-09 12:56:15 +00:00
Auxilor
dfed5b996a Cleaned up default configs 2022-11-09 12:46:23 +00:00
Auxilor
5adf8832a8 Oops 2022-11-09 11:46:01 +00:00
Auxilor
4335833b7b Cleanup 2022-11-09 11:35:37 +00:00
Auxilor
1d1a84991e Improvements to config 2022-11-09 11:20:07 +00:00
Auxilor
a2752daa07 Added %price% support to reforge stone 2022-11-08 17:33:25 +00:00
Auxilor
fb5926453c Cleanup 2022-11-08 17:31:34 +00:00
Auxilor
252e9472de Updated to 5.70.0 2022-11-08 17:30:54 +00:00
Auxilor
ebde54cb87 Added price support to reforges, added ecomponent 2022-11-08 17:30:47 +00:00
Auxilor
98aff77ab3 libreforge-updater 2022-11-06 19:52:00 +00:00
Auxilor
3ddf466f2d libreforge-updater 2022-11-01 16:23:07 +00:00
Auxilor
ca41b54daa libreforge-updater 2022-10-28 11:34:59 +01:00
Auxilor
ff9e16a25f libreforge-updater 2022-10-26 22:10:30 +01:00
Auxilor
c0d94f6150 Fix 2022-10-24 17:09:11 +01:00
Auxilor
4b3bf30a9b Fix 2022-10-24 17:08:49 +01:00
Auxilor
4c1ee554b4 libreforge-updater 2022-10-24 17:05:03 +01:00
Auxilor
695d90c793 Fixed reforge stone bug 2022-10-24 12:54:51 +01:00
Auxilor
a67270c09d libreforge-updater 2022-10-21 19:25:56 +01:00
Auxilor
8f23b22a05 libreforge-updater 2022-10-19 20:43:41 +01:00
Auxilor
7279958cca libreforge-updater 2022-10-18 14:13:24 +01:00
Auxilor
6689c3cf23 Fixed GUI, Improved _example.yml 2022-10-18 14:02:09 +01:00
Auxilor
df8357ac61 libreforge-updater 2022-10-16 23:26:48 +01:00
Auxilor
aa0f06092e libreforge-updater 2022-10-13 20:12:39 +01:00
Auxilor
19083d54b8 libreforge-updater 2022-10-10 21:04:09 +01:00
Auxilor
2a6c2941d8 libreforge-updater 2022-10-09 15:02:19 +01:00
Auxilor
757dffb08d libreforge-updater 2022-10-07 19:51:01 +01:00
Auxilor
277a0bef78 libreforge-updater 2022-10-06 12:04:08 +01:00
Auxilor
c7f8b9f97e libreforge-updater 2022-10-04 15:53:05 +01:00
Auxilor
0f97e2dfc4 Fixed reforge GUI 2022-10-04 12:33:52 +01:00
Auxilor
ae503fd646 libreforge-updater 2022-10-03 18:29:16 +01:00
Auxilor
89df16dabe libreforge-updater 2022-10-02 14:57:56 +01:00
Auxilor
c6dfa1849d libreforge-updater 2022-09-28 17:52:47 +01:00
Auxilor
fb4022dfd9 libreforge-updater 2022-09-26 18:27:29 +01:00
Auxilor
60c785717a libreforge-updater 2022-09-26 14:41:56 +01:00
Auxilor
a3810a9ff8 libreforge-updater 2022-09-26 10:51:59 +01:00
Auxilor
3498b575dc libreforge-updater 2022-09-22 17:30:19 +01:00
Auxilor
8f5668d8c4 libreforge-updater 2022-09-21 15:28:42 +01:00
Auxilor
6cde0ca092 libreforge-updater 2022-09-20 10:39:57 +01:00
Auxilor
d54e4ee8d5 libreforge-updater 2022-09-17 15:45:48 +01:00
Auxilor
65ef2a63d2 libreforge-updater 2022-09-15 12:16:42 +01:00
Auxilor
0d1ea5a7c8 libreforge-updater 2022-09-15 12:10:27 +01:00
Auxilor
7d32350eed libreforge-updater 2022-09-14 18:54:05 +01:00
Auxilor
4361ce0407 libreforge-updater 2022-09-14 15:13:49 +01:00
Auxilor
4267f5bd5d libreforge-updater 2022-09-14 15:10:16 +01:00
Auxilor
a5fc6e7436 libreforge-updater 2022-09-14 13:00:33 +01:00
Auxilor
cc5dfc0b0d libreforge-updater 2022-09-13 19:16:01 +01:00
Auxilor
16082cf3c6 libreforge-updater 2022-09-12 21:22:09 +01:00
Auxilor
0d3485855a libreforge-updater 2022-09-12 17:15:58 +01:00
Auxilor
afaafb5899 libreforge-updater 2022-09-11 19:28:17 +01:00
Auxilor
8fbc672f1f libreforge-updater 2022-09-10 12:59:07 +01:00
Auxilor
19221c8969 libreforge-updater 2022-09-10 10:52:11 +01:00
Auxilor
0f96c5027e libreforge-updater 2022-09-06 15:44:05 +01:00
Auxilor
e58429c9c7 libreforge-updater 2022-09-06 13:46:56 +01:00
Auxilor
f2831f0bcd libreforge-updater 2022-09-06 11:26:12 +01:00
Auxilor
1c84929739 libreforge-updater 2022-09-05 18:01:20 +01:00
Auxilor
67b4e340d8 libreforge-updater 2022-09-04 17:23:21 +01:00
Auxilor
f6b23bf649 libreforge-updater 2022-09-04 16:22:50 +01:00
Auxilor
515d5022ba libreforge-updater 2022-09-03 14:21:09 +01:00
Auxilor
bf0813ae70 libreforge-updater 2022-09-01 13:07:13 +01:00
Auxilor
c5330b79b5 libreforge-updater 2022-08-31 12:46:44 +01:00
Auxilor
e961411808 libreforge-updater 2022-08-30 20:29:37 +01:00
Auxilor
75d8475ece libreforge-updater 2022-08-30 19:22:16 +01:00
Auxilor
9e7d9559d9 libreforge-updater 2022-08-29 10:59:43 +01:00
Auxilor
a58c7c892a libreforge-updater 2022-08-28 15:41:45 +01:00
Auxilor
9eaad16592 libreforge-updater 2022-08-27 11:27:38 +01:00
Auxilor
83690068b2 libreforge-updater 2022-08-24 12:52:19 +02:00
Auxilor
1391cdc978 libreforge-updater 2022-08-24 12:49:22 +02:00
Auxilor
9c6461984e libreforge-updater 2022-08-24 11:56:30 +02:00
Auxilor
340fcb1908 libreforge-updater 2022-08-23 11:06:49 +02:00
Auxilor
7f0f8078aa libreforge-updater 2022-08-22 12:45:17 +02:00
Auxilor
e1c70dd4b4 libreforge-updater 2022-08-20 09:58:58 +02:00
Auxilor
ec3a4215b7 libreforge-updater 2022-08-17 14:21:02 +02:00
Auxilor
4f80c3b5f3 libreforge-updater 2022-08-17 12:08:50 +02:00
Auxilor
55efb74fb4 libreforge-updater 2022-08-16 18:44:50 +02:00
Auxilor
d4efad6cd7 libreforge-updater 2022-08-14 17:29:22 +02:00
Auxilor
4fc10862f6 libreforge-updater 2022-08-13 11:56:10 +02:00
Auxilor
c0b96e58ff libreforge-updater 2022-08-05 18:42:27 +01:00
Auxilor
1bdf9b9f4c libreforge-updater 2022-08-05 18:40:57 +01:00
Auxilor
9baaf37108 libreforge-updater 2022-08-04 13:04:31 +01:00
Auxilor
8b89c16754 lang 2022-08-04 12:39:29 +01:00
Auxilor
8ee6b64dec lang 2022-08-04 12:36:42 +01:00
Auxilor
507e476de0 lang 2022-08-04 12:29:26 +01:00
Auxilor
e4bdc914d6 libreforge-updater 2022-08-04 12:27:32 +01:00
Auxilor
89c11c5d03 libreforge-updater 2022-08-04 12:25:20 +01:00
Auxilor
ace9174713 libreforge-updater 2022-08-02 16:27:39 +01:00
Auxilor
11b755c03e libreforge-updater 2022-08-02 16:22:17 +01:00
Auxilor
e502281fac libreforge-updater 2022-08-02 16:18:20 +01:00
Auxilor
7f5b2e28d4 libreforge-updater 2022-08-01 11:20:25 +01:00
Auxilor
0c77fae5c0 libreforge-updater 2022-07-29 17:51:47 +01:00
Auxilor
67c67fe494 libreforge-updater 2022-07-27 20:18:29 +01:00
Auxilor
91cd161e0f libreforge-updater 2022-07-25 17:54:45 +01:00
Auxilor
0ae01af7cf libreforge-updater 2022-07-25 17:03:41 +01:00
Auxilor
7dd0f35f1f Fixed migration 2022-07-24 22:51:14 +01:00
Auxilor
e4afc37f45 libreforge-updater 2022-07-24 22:49:58 +01:00
Auxilor
b74a7f1085 libreforge-updater 2022-07-24 21:52:02 +01:00
Auxilor
94d2ab4593 Updated to 5.27.3 2022-07-24 15:44:27 +01:00
Auxilor
9fce6a6d74 Updated eco, fixed display 2022-07-24 15:44:19 +01:00
Auxilor
a84231c13b libreforge-updater 2022-07-23 17:44:02 +01:00
Auxilor
c833cc9b67 libreforge-updater 2022-07-22 14:22:10 +01:00
Auxilor
2018f5c506 libreforge-updater 2022-07-21 20:15:20 +01:00
Auxilor
783b14d650 libreforge-updater 2022-07-20 00:11:25 +01:00
Auxilor
793075a70e libreforge-updater 2022-07-13 21:23:48 +01:00
Auxilor
f1f3d5b014 libreforge-updater 2022-07-12 14:59:51 +01:00
Auxilor
a0af472e17 libreforge-updater 2022-07-11 16:17:28 +01:00
Auxilor
060b981019 libreforge-updater 2022-07-09 12:11:45 +01:00
66 changed files with 1277 additions and 1669 deletions

1
.github/CODEOWNERS vendored Normal file
View File

@@ -0,0 +1 @@
* @WillFP

View File

@@ -1,8 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Auxilor Community Discord
- name: Discord
url: https://discord.gg/ZcwpSsE/
about: Join the Auxilor discord to get help from support staff and the general community!
- name: The most common issues people have
url: https://github.com/Auxilor/eco/issues/78
about: Check the list of known common issues to see if your issue has already been solved
about: Issues have moved to Discord, please join the server to get help!

View File

@@ -4,28 +4,8 @@ about: Report an issue with the plugin
title: ''
labels: bug
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
# Please report bugs on the discord!
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Server Information (please complete the following information):**
- Version: (output of `/ver` command)
- Version of plugin and eco (`/ver eco`, `/ver <plugin>`)
**Additional context**
Add any other context about the problem here.
[Join by clicking here](https://discord.gg/ZcwpSsE/)

View File

@@ -1,20 +0,0 @@
---
name: Request a Feature
about: Suggest an idea for this plugin
title: ''
labels: enhancement
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

33
.github/workflows/publish-release.yml vendored Normal file
View File

@@ -0,0 +1,33 @@
name: Publish Packages
on:
workflow_dispatch:
release:
types: [ created ]
push:
tags:
- '*'
jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Checkout latest code
uses: actions/checkout@v2
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 21
- name: Change wrapper permissions
run: chmod +x ./gradlew
- name: Publish package
uses: gradle/gradle-build-action@v2
with:
arguments: publish
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

View File

@@ -1,115 +0,0 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
}
}
plugins {
id 'java-library'
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'maven-publish'
id 'java'
}
dependencies {
implementation project(":eco-core").getSubprojects()
}
allprojects {
apply plugin: 'kotlin'
apply plugin: 'java'
apply plugin: 'maven-publish'
apply plugin: 'com.github.johnrengelman.shadow'
repositories {
mavenCentral()
mavenLocal()
maven { url 'https://jitpack.io' }
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
maven { url 'https://papermc.io/repo/repository/maven-public/' }
maven { url 'https://repo.rosewooddev.io/repository/public/' }
}
jar {
onlyIf { !sourceSets.main.allSource.files.isEmpty() }
}
shadowJar {
relocate('com.willfp.libreforge', 'com.willfp.reforges.libreforge')
relocate('org.joml', 'com.willfp.reforges.libreforge.joml')
}
dependencies {
compileOnly 'com.willfp:eco:6.36.0'
implementation 'com.willfp:libreforge:3.72.1'
implementation 'org.joml:joml:1.10.4'
compileOnly 'org.jetbrains:annotations:23.0.0'
compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
}
tasks.withType(JavaCompile) {
options.deprecation = true
options.encoding = 'UTF-8'
}
processResources {
filesNotMatching(["**/*.png", "**/models/**", "**/textures/**", "**reforges.yml", "**lang.yml"]) {
expand projectVersion: project.version
}
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions {
jvmTarget = "17"
}
}
java.sourceCompatibility = JavaVersion.VERSION_17
java.targetCompatibility = JavaVersion.VERSION_17
compileJava.options.encoding = 'UTF-8'
compileJava.dependsOn clean
build.dependsOn shadowJar
}
tasks.withType(Jar) {
destinationDirectory = file("$rootDir/bin/")
}
clean.doLast {
file("${rootDir}/bin").deleteDir()
}
shadowJar {
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
}
jar {
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
}
group = 'com.willfp'
archivesBaseName = project.name
version = findProperty("version")
build.dependsOn shadowJar
task buyThePlugins {
dependsOn subprojects.build
doLast {
println 'If you like the plugin, please consider buying it on Spigot or Polymart!'
println 'Spigot: https://www.spigotmc.org/resources/authors/auxilor.507394/'
println 'Polymart: https://polymart.org/user/auxilor.1107/'
println 'Buying gives you access to support and the plugin auto-updater, and it allows me to keep developing plugins.'
}
}
build.finalizedBy buyThePlugins

85
build.gradle.kts Normal file
View File

@@ -0,0 +1,85 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
java
`java-library`
`maven-publish`
kotlin("jvm") version "2.1.0"
id("com.gradleup.shadow") version "8.3.0"
id("com.willfp.libreforge-gradle-plugin") version "1.0.0"
}
group = "com.willfp"
version = findProperty("version")!!
val libreforgeVersion = findProperty("libreforge-version")
base {
archivesName.set(project.name)
}
dependencies {
project(":eco-core").dependencyProject.subprojects {
implementation(this)
}
}
allprojects {
apply(plugin = "java")
apply(plugin = "kotlin")
apply(plugin = "maven-publish")
apply(plugin = "com.gradleup.shadow")
repositories {
mavenLocal()
mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://repo.auxilor.io/repository/maven-public/")
maven("https://jitpack.io")
}
dependencies {
compileOnly("com.willfp:eco:6.73.0")
compileOnly("org.jetbrains:annotations:23.0.0")
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
}
java {
withSourcesJar()
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
tasks {
shadowJar {
relocate("com.willfp.libreforge.loader", "com.willfp.reforges.libreforge.loader")
relocate("com.willfp.ecomponent", "com.willfp.reforges.ecomponent")
}
compileKotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
}
}
compileJava {
options.isDeprecation = true
options.encoding = "UTF-8"
dependsOn(clean)
}
processResources {
filesMatching(listOf("**plugin.yml", "**eco.yml")) {
expand(
"version" to project.version,
"libreforgeVersion" to libreforgeVersion,
"pluginName" to rootProject.name
)
}
}
build {
dependsOn(shadowJar)
}
}
}

View File

@@ -1,184 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<!--
Checkstyle configuration that checks the sun coding conventions from:
- the Java Language Specification at
https://docs.oracle.com/javase/specs/jls/se11/html/index.html
- the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
- the Javadoc guidelines at
https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
- the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
- some best practices
Checkstyle is very configurable. Be sure to read the documentation at
https://checkstyle.org (or in your downloaded distribution).
Most Checks are configurable, be sure to consult the documentation.
To completely disable a check, just comment it out or delete it from the file.
To suppress certain violations please review suppression filters.
Finally, it is worth reading the documentation.
-->
<module name="Checker">
<module name="SuppressionFilter">
<property name="file" value="config/checkstyle/suppression.xml"/>
</module>
<!--
If you set the basedir property below, then all reported file
names will be relative to the specified directory. See
https://checkstyle.org/config.html#Checker
<property name="basedir" value="${basedir}"/>
-->
<property name="severity" value="error"/>
<property name="fileExtensions" value="java, properties, xml"/>
<!-- Excludes all 'module-info.java' files -->
<!-- See https://checkstyle.org/config_filefilters.html -->
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="module\-info\.java$"/>
</module>
<!-- Checks whether files end with a new line. -->
<!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
<module name="NewlineAtEndOfFile"/>
<!-- Checks that property files contain the same keys. -->
<!-- See https://checkstyle.org/config_misc.html#Translation -->
<module name="Translation"/>
<!-- Checks for Size Violations. -->
<!-- See https://checkstyle.org/config_sizes.html -->
<module name="FileLength"/>
<module name="LineLength">
<property name="fileExtensions" value="java"/>
<property name="max" value="200"/>
</module>
<!-- Checks for whitespace -->
<!-- See https://checkstyle.org/config_whitespace.html -->
<module name="FileTabCharacter"/>
<!-- Miscellaneous other checks. -->
<!-- See https://checkstyle.org/config_misc.html -->
<module name="RegexpSingleline">
<property name="format" value="\s+$"/>
<property name="minimum" value="0"/>
<property name="maximum" value="0"/>
<property name="message" value="Line has trailing spaces."/>
</module>
<!-- Checks for Headers -->
<!-- See https://checkstyle.org/config_header.html -->
<!-- <module name="Header"> -->
<!-- <property name="headerFile" value="${checkstyle.header.file}"/> -->
<!-- <property name="fileExtensions" value="java"/> -->
<!-- </module> -->
<module name="TreeWalker">
<!-- Checks for Javadoc comments. -->
<!-- See https://checkstyle.org/config_javadoc.html -->
<module name="InvalidJavadocPosition"/>
<module name="JavadocMethod"/>
<module name="JavadocType"/>
<module name="JavadocVariable"/>
<module name="JavadocStyle"/>
<module name="MissingJavadocMethod"/>
<!-- Checks for Naming Conventions. -->
<!-- See https://checkstyle.org/config_naming.html -->
<module name="ConstantName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName"/>
<module name="MethodName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
<!-- Checks for imports -->
<!-- See https://checkstyle.org/config_imports.html -->
<module name="AvoidStarImport"/>
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<module name="UnusedImports">
<property name="processJavadoc" value="true"/>
</module>
<!-- Checks for Size Violations. -->
<!-- See https://checkstyle.org/config_sizes.html -->
<!-- <module name="MethodLength"/> -->
<module name="ParameterNumber"/>
<!-- Checks for whitespace -->
<!-- See https://checkstyle.org/config_whitespace.html -->
<module name="EmptyForIteratorPad"/>
<module name="GenericWhitespace"/>
<module name="MethodParamPad"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
<!-- Modifier Checks -->
<!-- See https://checkstyle.org/config_modifiers.html -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<!-- Checks for blocks. You know, those {}'s -->
<!-- See https://checkstyle.org/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
<!-- Checks for common coding problems -->
<!-- See https://checkstyle.org/config_coding.html -->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation"/>
<module name="InnerAssignment"/>
<!-- <module name="MagicNumber"/> -->
<module name="MissingSwitchDefault"/>
<module name="MultipleVariableDeclarations"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<!-- Checks for class design -->
<!-- See https://checkstyle.org/config_design.html -->
<!-- <module name="DesignForExtension"/> -->
<module name="FinalClass"/>
<!-- <module name="HideUtilityClassConstructor"/> -->
<module name="InterfaceIsType"/>
<module name="VisibilityModifier"/>
<module name="RequireThis"/>
<!-- Miscellaneous other checks. -->
<!-- See https://checkstyle.org/config_misc.html -->
<module name="ArrayTypeStyle"/>
<module name="FinalParameters"/>
<module name="TodoComment"/>
<module name="UpperEll"/>
</module>
</module>

View File

@@ -1,14 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<!-- Effects don't need javadoc. -->
<suppress files="[\\/]reforges[\\/]reforges[\\/]" checks="MissingJavadocMethod"/>
<suppress files="[\\/]reforges[\\/]reforges[\\/]" checks="JavadocVariable"/>
<!-- Fields don't need javadoc -->
<suppress files="Reforges.java" checks="JavadocVariable"/>
</suppressions>

View File

@@ -1,2 +0,0 @@
group 'com.willfp'
version rootProject.version

View File

@@ -0,0 +1,2 @@
group = "com.willfp"
version = rootProject.version

View File

@@ -1,21 +0,0 @@
group 'com.willfp'
version rootProject.version
dependencies {
compileOnly fileTree(dir: '../../lib', include: ['*.jar'])
compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
compileOnly 'com.willfp:EcoSkills:1.4.0'
compileOnly 'com.willfp:Talismans:5.28.2'
compileOnly 'com.github.Archy-X:AureliumSkills:Beta1.2.4'
}
build.dependsOn publishToMavenLocal
publishing {
publications {
maven(MavenPublication) {
from(components.java)
}
}
}

View File

@@ -0,0 +1,41 @@
group = "com.willfp"
version = rootProject.version
dependencies {
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
compileOnly("com.willfp:Talismans:6.0.0")
compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.2")
implementation("com.willfp:ecomponent:1.3.0")
}
publishing {
publications {
register<MavenPublication>("maven") {
groupId = project.group.toString()
version = project.version.toString()
artifactId = rootProject.name
artifact(rootProject.tasks.shadowJar.get().archiveFile)
}
}
publishing {
repositories {
maven {
name = "auxilor"
url = uri("https://repo.auxilor.io/repository/maven-releases/")
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
}
}
}
}
}
tasks {
build {
dependsOn(publishToMavenLocal)
}
}

View File

@@ -2,47 +2,63 @@ package com.willfp.reforges
import com.willfp.eco.core.command.impl.PluginCommand
import com.willfp.eco.core.display.DisplayModule
import com.willfp.eco.core.integrations.IntegrationLoader
import com.willfp.eco.core.items.Items
import com.willfp.libreforge.LibReforgePlugin
import com.willfp.libreforge.conditions.Conditions
import com.willfp.libreforge.loader.LibreforgePlugin
import com.willfp.libreforge.loader.configs.ConfigCategory
import com.willfp.libreforge.registerHolderProvider
import com.willfp.reforges.commands.CommandReforge
import com.willfp.reforges.commands.CommandReforges
import com.willfp.reforges.config.ReforgesYml
import com.willfp.reforges.config.TargetYml
import com.willfp.reforges.display.ReforgesDisplay
import com.willfp.reforges.integrations.talismans.TalismansIntegration
import com.willfp.reforges.gui.ReforgeGUI
import com.willfp.reforges.libreforge.ConditionHasReforge
import com.willfp.reforges.reforges.PriceMultipliers
import com.willfp.reforges.reforges.ReforgeFinder
import com.willfp.reforges.reforges.ReforgeStoneTag
import com.willfp.reforges.reforges.ReforgeTargets
import com.willfp.reforges.reforges.ReforgedTag
import com.willfp.reforges.reforges.Reforges
import com.willfp.reforges.reforges.util.ReforgeArgParser
import com.willfp.reforges.util.ReforgeEnableListeners
import com.willfp.reforges.util.ReforgeLookup
import com.willfp.reforges.util.AntiPlaceListener
import com.willfp.reforges.util.DiscoverRecipeListener
import org.bukkit.event.Listener
class ReforgesPlugin : LibReforgePlugin() {
class ReforgesPlugin : LibreforgePlugin() {
val targetYml: TargetYml =
TargetYml(this)
val reforgesYml: ReforgesYml =
ReforgesYml(this)
init {
instance = this
}
override fun handleEnableAdditional() {
Items.registerArgParser(ReforgeArgParser())
registerHolderProvider { ReforgeLookup.provideReforges(it) }
override fun loadConfigCategories(): List<ConfigCategory> {
return listOf(
Reforges
)
}
override fun handleReloadAdditional() {
logger.info(Reforges.values().size.toString() + " Reforges Loaded")
override fun handleEnable() {
Conditions.register(ConditionHasReforge)
Items.registerArgParser(ReforgeArgParser)
Items.registerTag(ReforgedTag(this))
Items.registerTag(ReforgeStoneTag(this))
registerHolderProvider(ReforgeFinder.toHolderProvider())
}
override fun handleReload() {
ReforgeTargets.update(this)
PriceMultipliers.update(this)
ReforgeGUI.update(this)
}
override fun loadListeners(): List<Listener> {
return listOf(
DiscoverRecipeListener(this),
AntiPlaceListener(),
ReforgeEnableListeners(this)
)
}
@@ -53,20 +69,12 @@ class ReforgesPlugin : LibReforgePlugin() {
)
}
override fun createDisplayModule(): DisplayModule {
return ReforgesDisplay(this)
}
override fun loadAdditionalIntegrations(): List<IntegrationLoader> {
override fun loadDisplayModules(): List<DisplayModule> {
return listOf(
IntegrationLoader("Talismans") { TalismansIntegration.registerProvider() }
ReforgesDisplay(this)
)
}
override fun getMinimumEcoVersion(): String {
return "6.35.1"
}
companion object {
/**
* Instance of Reforges.
@@ -75,4 +83,4 @@ class ReforgesPlugin : LibReforgePlugin() {
lateinit var instance: ReforgesPlugin
private set
}
}
}

View File

@@ -28,6 +28,7 @@ class CommandApply(
if (sender is Player) {
val item = sender.inventory.itemInMainHand
item.reforge = reforge
reforge.runOnReforgeEffects(sender, item)
sender.sendMessage(
plugin.langYml.getMessage("applied-reforge")
.replace("%reforge%", reforge.name)
@@ -45,7 +46,10 @@ class CommandApply(
return
}
player.inventory.itemInMainHand.reforge = reforge
val item = player.inventory.itemInMainHand
item.reforge = reforge
reforge.runOnReforgeEffects(player, item)
sender.sendMessage(
plugin.langYml.getMessage("applied-reforge")
.replace("%reforge%", reforge.name)
@@ -57,12 +61,12 @@ class CommandApply(
val completions = mutableListOf<String>()
if (args.isEmpty()) {
// Currently, this case is not ever reached
return Reforges.values().map { it.id }
return Reforges.values().map { it.id.key }
}
if (args.size == 1) {
StringUtil.copyPartialMatches(
args[0],
Reforges.values().map { it.id },
Reforges.values().map { it.id.key },
completions
)
completions.sort()

View File

@@ -58,7 +58,7 @@ class CommandGive(
val completions = mutableListOf<String>()
if (args.isEmpty()) {
// Currently, this case is not ever reached
return Reforges.values().filter { it.requiresStone }.map { it.id }
return Reforges.values().filter { it.requiresStone }.map { it.id.key }
}
if (args.size == 1) {
StringUtil.copyPartialMatches(
@@ -71,7 +71,7 @@ class CommandGive(
if (args.size == 2) {
StringUtil.copyPartialMatches(
args[1],
Reforges.values().filter { it.requiresStone }.map { it.id },
Reforges.values().filter { it.requiresStone }.map { it.id.key },
completions
)
completions.sort()

View File

@@ -4,7 +4,8 @@ import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.command.impl.PluginCommand
import org.bukkit.command.CommandSender
class CommandReforges(plugin: EcoPlugin) : PluginCommand(plugin, "reforges", "reforges.command.reforges", false) {
class CommandReforges(plugin: EcoPlugin) :
PluginCommand(plugin, "reforges", "reforges.command.reforges", false) {
override fun onExecute(sender: CommandSender, args: List<String>) {
sender.sendMessage(
plugin.langYml.getMessage("invalid-command")
@@ -17,4 +18,4 @@ class CommandReforges(plugin: EcoPlugin) : PluginCommand(plugin, "reforges", "re
.addSubcommand(CommandOpen(plugin))
.addSubcommand(CommandApply(plugin))
}
}
}

View File

@@ -1,7 +0,0 @@
package com.willfp.reforges.config
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.config.BaseConfig
import com.willfp.eco.core.config.ConfigType
class ReforgesYml(plugin: EcoPlugin) : BaseConfig("reforges", plugin, true, ConfigType.YAML)

View File

@@ -5,8 +5,10 @@ import com.willfp.eco.core.config.ConfigType
import com.willfp.eco.core.config.StaticBaseConfig
import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.TestableItem
import com.willfp.reforges.reforges.ReforgeTarget
import java.util.*
import com.willfp.libreforge.slot.SlotType
import com.willfp.libreforge.slot.SlotTypes
import com.willfp.libreforge.slot.impl.SlotTypeAny
import java.util.Locale
import java.util.function.Consumer
class TargetYml(plugin: EcoPlugin) : StaticBaseConfig("target", plugin, ConfigType.YAML) {
@@ -32,12 +34,12 @@ class TargetYml(plugin: EcoPlugin) : StaticBaseConfig("target", plugin, ConfigTy
}
/**
* Get all materials from a target name.
* Get a [SlotType] for the target.
*
* @param target The name of the target.
* @return All materials.
* @return The [SlotType].
*/
fun getSlot(target: String): ReforgeTarget.Slot {
return ReforgeTarget.Slot.valueOf(this.getString("$target.slot").uppercase(Locale.getDefault()))
fun getSlot(target: String): SlotType {
return SlotTypes[this.getString("$target.slot")] ?: SlotTypeAny
}
}

View File

@@ -3,11 +3,16 @@ package com.willfp.reforges.display
import com.willfp.eco.core.display.Display
import com.willfp.eco.core.display.DisplayModule
import com.willfp.eco.core.display.DisplayPriority
import com.willfp.eco.core.display.DisplayProperties
import com.willfp.eco.core.fast.FastItemStack
import com.willfp.eco.core.fast.fast
import com.willfp.eco.core.placeholder.context.placeholderContext
import com.willfp.eco.util.SkullUtils
import com.willfp.eco.util.StringUtils
import com.willfp.eco.util.formatEco
import com.willfp.eco.util.toJSON
import com.willfp.libreforge.ItemProvidedHolder
import com.willfp.libreforge.ProvidedHolder
import com.willfp.reforges.ReforgesPlugin
import com.willfp.reforges.reforges.ReforgeTargets
import com.willfp.reforges.util.reforge
@@ -24,6 +29,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
override fun display(
itemStack: ItemStack,
player: Player?,
props: DisplayProperties,
vararg args: Any
) {
val targets = ReforgeTargets.getForItem(itemStack)
@@ -42,13 +48,15 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
val reforge = fast.persistentDataContainer.reforge
val context = placeholderContext(
player = player,
item = itemStack
)
if (reforge == null && stone == null) {
if (plugin.configYml.getBool("reforge.show-reforgable")) {
if (player != null && plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
val inventory = player.openInventory.topInventory
if (inventory.contents.contains(itemStack) && inventory.holder == null) {
return
}
if (props.inGui) {
return
}
val addLore: MutableList<String> = ArrayList()
@@ -67,17 +75,17 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
val stoneTexture = SkullUtils.getSkullTexture(stoneMeta)
if (stoneTexture != null) {
try {
SkullUtils.setSkullTexture(meta as SkullMeta, stoneTexture)
} catch (e: StringIndexOutOfBoundsException) {
// Do nothing
}
SkullUtils.setSkullTexture(meta as SkullMeta, stoneTexture)
}
}
itemStack.itemMeta = meta
val stoneLore = stone.config.getFormattedStrings("stone.lore").map {
"${Display.PREFIX}$it"
}.toList()
val stoneLore = stone.config.getStrings("stone.lore")
.map { it.replace("%price%", if (player == null) "" else stone.stonePrice?.getDisplay(player) ?: "") }
.formatEco(player)
.map { "${Display.PREFIX}$it" }
lore.addAll(0, stoneLore)
}
@@ -87,10 +95,11 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
for (string in plugin.configYml.getFormattedStrings("reforge.reforged-prefix")) {
addLore.add(Display.PREFIX + string.replace("%reforge%", reforge.name))
}
addLore.addAll(reforge.description)
addLore.addAll(reforge.description.formatEco(context))
addLore.replaceAll { "${Display.PREFIX}$it" }
lore.addAll(addLore)
}
if (plugin.configYml.getBool("reforge.display-in-name")) {
val displayName = fastItemStack.displayNameComponent
@@ -109,7 +118,9 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
if (player != null) {
val lines = reforge.getNotMetLines(player).map { Display.PREFIX + it }
val provided = ItemProvidedHolder(reforge, itemStack)
val lines = provided.getNotMetLines(player).map { Display.PREFIX + it }
if (lines.isNotEmpty()) {
lore.add(Display.PREFIX)

View File

@@ -1,226 +1,204 @@
package com.willfp.reforges.gui
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.config.updating.ConfigUpdater
import com.willfp.eco.core.config.emptyConfig
import com.willfp.eco.core.drops.DropQueue
import com.willfp.eco.core.fast.fast
import com.willfp.eco.core.gui.captiveSlot
import com.willfp.eco.core.gui.menu
import com.willfp.eco.core.gui.menu.Menu
import com.willfp.eco.core.gui.menu.MenuEvent
import com.willfp.eco.core.gui.menu.events.CaptiveItemChangeEvent
import com.willfp.eco.core.gui.onEvent
import com.willfp.eco.core.gui.slot
import com.willfp.eco.core.gui.slot.CustomSlot
import com.willfp.eco.core.gui.slot.FillerMask
import com.willfp.eco.core.gui.slot.MaskItems
import com.willfp.eco.core.gui.slot.Slot
import com.willfp.eco.core.integrations.economy.EconomyManager
import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.builder.ItemStackBuilder
import com.willfp.eco.util.NumberUtils
import com.willfp.reforges.reforges.PriceMultipliers
import com.willfp.eco.core.items.builder.modify
import com.willfp.eco.core.items.isEmpty
import com.willfp.eco.core.price.ConfiguredPrice
import com.willfp.eco.core.sound.PlayableSound
import com.willfp.ecomponent.CaptiveItem
import com.willfp.ecomponent.menuStateVar
import com.willfp.ecomponent.setSlot
import com.willfp.libreforge.LibreforgeSpigotPlugin
import com.willfp.reforges.reforges.PriceMultipliers.reforgePriceMultiplier
import com.willfp.reforges.reforges.Reforge
import com.willfp.reforges.reforges.ReforgeTarget
import com.willfp.reforges.reforges.ReforgeTargets
import com.willfp.reforges.reforges.util.MetadatedReforgeStatus
import com.willfp.reforges.util.ReforgeStatus
import com.willfp.reforges.util.getRandomReforge
import com.willfp.reforges.util.reforge
import com.willfp.reforges.util.reforgeStone
import com.willfp.reforges.util.timesReforged
import org.bukkit.Material
import org.bukkit.Sound
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import java.util.*
import java.util.Locale
import kotlin.math.pow
private data class ReforgeGUIStatus(
val status: ReforgeStatus,
val price: ConfiguredPrice,
val isStonePrice: Boolean
)
private class ReforgePriceChangeEvent : MenuEvent
private val Menu.reforgeStatus by menuStateVar(
ReforgeGUIStatus(
ReforgeStatus.NO_ITEM,
ConfiguredPrice.createOrFree(emptyConfig()),
false
)
)
private class IndicatorSlot(
plugin: EcoPlugin
) : CustomSlot() {
private val slot = slot { player, menu ->
val status = menu.reforgeStatus[player].status
if (status == ReforgeStatus.ALLOW || status == ReforgeStatus.ALLOW_STONE) {
Items.lookup(plugin.configYml.getString("gui.show-allowed.allow-material")).item
} else {
Items.lookup(plugin.configYml.getString("gui.show-allowed.deny-material")).item
}
}
init {
init(slot)
}
}
private class ActivatorSlot(
plugin: EcoPlugin,
itemToReforge: CaptiveItem,
reforgeStone: CaptiveItem
) : CustomSlot() {
private val slot = slot({ player, menu ->
val (status, price) = menu.reforgeStatus[player]
val configKey = status.configKey
Items.lookup(plugin.configYml.getString("gui.$configKey.material")).modify {
setDisplayName(plugin.configYml.getString("gui.$configKey.name"))
addLoreLines(plugin.configYml.getStrings("gui.$configKey.lore").map {
it.replace("%price%", price.getDisplay(player))
.replace(
"%stone%",
reforgeStone[player]?.reforgeStone?.name ?: ""
)
// Legacy
.replace("%cost%", price.getDisplay(player))
.replace("%xpcost%", price.getDisplay(player))
})
}
}) {
onLeftClick { event, _, menu ->
val player = event.whoClicked as Player
val item = itemToReforge[player] ?: return@onLeftClick
val currentReforge = item.reforge
val targets = ReforgeTargets.getForItem(item)
var usedStone = false
val stoneInMenu = reforgeStone[player]?.reforgeStone
val reforge = if (stoneInMenu != null && stoneInMenu.canBeAppliedTo(item)) {
usedStone = true
stoneInMenu
} else {
val disallowed = mutableListOf<Reforge>()
if (currentReforge != null) {
disallowed.add(currentReforge)
}
targets.getRandomReforge(disallowed = disallowed)
}
if (reforge == null) {
return@onLeftClick
}
val price = menu.reforgeStatus[player].price
if (!price.canAfford(player)) {
player.sendMessage(
// Not clean but hey ho
EcoPlugin.getPlugin(LibreforgeSpigotPlugin::class.java)
.langYml.getMessage("cannot-afford-price").replace("%price%", price.getDisplay(player))
)
if (plugin.configYml.getBool("gui.cannot-afford-sound.enabled")) {
PlayableSound.create(
plugin.configYml.getSubsection("gui.cannot-afford-sound")
)?.playTo(player)
}
return@onLeftClick
}
price.pay(player)
player.sendMessage(plugin.langYml.getMessage("applied-reforge").replace("%reforge%", reforge.name))
item.timesReforged++
item.reforge = reforge
reforge.runOnReforgeEffects(player, item)
if (usedStone) {
val stone = reforgeStone[player]
stone?.amount = stone?.amount?.minus(1) ?: 0
if (plugin.configYml.getBool("gui.stone-sound.enabled")) {
player.playSound(
player.location,
Sound.valueOf(
plugin.configYml.getString("gui.stone-sound.id").uppercase(Locale.getDefault())
),
1f, plugin.configYml.getDouble("gui.stone-sound.pitch").toFloat()
)
}
}
if (plugin.configYml.getBool("gui.sound.enabled")) {
player.playSound(
player.location,
Sound.valueOf(plugin.configYml.getString("gui.sound.id").uppercase(Locale.getDefault())),
1f, plugin.configYml.getDouble("gui.sound.pitch").toFloat()
)
}
menu.callEvent(player, ReforgePriceChangeEvent())
}
}
init {
init(slot)
}
}
@Suppress("DEPRECATION")
object ReforgeGUI {
private lateinit var menu: Menu
private fun Menu.getReforgeStatus(player: Player): MetadatedReforgeStatus {
val captive = this.getCaptiveItems(player)
val item = captive.getOrNull(0)
val stone = captive.getOrNull(1)
private lateinit var itemToReforge: CaptiveItem
private lateinit var reforgeStone: CaptiveItem
val targets = mutableListOf<ReforgeTarget>()
private lateinit var defaultPrice: ConfiguredPrice
var cost = 0.0
val status = if (item == null || item.type == Material.AIR) {
ReforgeStatus.NO_ITEM
} else {
targets.addAll(ReforgeTargets.getForItem(item))
if (targets.isEmpty()) {
ReforgeStatus.INVALID_ITEM
} else {
val reforgeStone = stone.reforgeStone
if (reforgeStone != null && reforgeStone.canBeAppliedTo(item)) {
cost = reforgeStone.stonePrice.toDouble()
ReforgeStatus.ALLOW_STONE
} else {
ReforgeStatus.ALLOW
}
}
}
return MetadatedReforgeStatus(status, cost)
}
@JvmStatic
fun open(player: Player) {
menu.open(player)
}
@JvmStatic
@ConfigUpdater
fun update(plugin: EcoPlugin) {
val activatorSlot = slot(ItemStack(Material.ANVIL)) {
setUpdater { player, menu, _ ->
val (status, specialCost) = menu.getReforgeStatus(player)
internal fun update(plugin: EcoPlugin) {
itemToReforge = CaptiveItem()
reforgeStone = CaptiveItem()
val cost = when {
status == ReforgeStatus.ALLOW || (status == ReforgeStatus.ALLOW_STONE && specialCost < 0) -> {
val amountOfReforges = menu.getCaptiveItems(player)[0].timesReforged
plugin.configYml.getDouble("reforge.cost") *
plugin.configYml.getDouble("reforge.cost-exponent").pow(amountOfReforges) *
PriceMultipliers.getForPlayer(player).multiplier
}
status == ReforgeStatus.ALLOW_STONE -> {
specialCost
}
else -> 0.0 // Never used, but at least kotlin can shut up
}
var xpCost = plugin.configYml.getInt("reforge.xp-cost")
if (status == ReforgeStatus.ALLOW) {
val item = menu.getCaptiveItems(player)[0]
val reforges = item.timesReforged
xpCost *= PriceMultipliers.getForPlayer(player).multiplier.toInt()
xpCost *= plugin.configYml.getDouble("reforge.cost-exponent").pow(reforges.toDouble()).toInt()
}
val configKey = status.configKey
Items.lookup(plugin.configYml.getString("gui.$configKey.material")).item.apply {
this.fast().displayName = plugin.configYml.getFormattedString("gui.$configKey.name")
this.fast().lore = plugin.configYml.getFormattedStrings("gui.$configKey.lore").map {
it.replace("%cost%", NumberUtils.format(cost))
.replace("%xpcost%", NumberUtils.format(xpCost.toDouble()))
.replace(
"%stone%",
menu.getCaptiveItems(player).getOrNull(1).reforgeStone?.name ?: ""
)
}
}
}
onLeftClick { event, _, menu ->
val player = event.whoClicked as Player
val captive = menu.getCaptiveItems(player)
val item = captive.getOrNull(0) ?: return@onLeftClick
val currentReforge = item.reforge
val targets = ReforgeTargets.getForItem(item)
var usedStone = false
val stoneInMenu = menu.getCaptiveItems(player).getOrNull(1).reforgeStone
val reforge = if (stoneInMenu != null && stoneInMenu.canBeAppliedTo(item)) {
usedStone = true
stoneInMenu
} else {
val disallowed = mutableListOf<Reforge>()
if (currentReforge != null) {
disallowed.add(currentReforge)
}
targets.getRandomReforge(disallowed = disallowed)
}
if (reforge == null) {
return@onLeftClick
}
var cost = 0.0
val reforges = item.timesReforged
if (EconomyManager.hasRegistrations()) {
cost = plugin.configYml.getDouble("reforge.cost")
cost *= plugin.configYml.getDouble("reforge.cost-exponent").pow(reforges.toDouble())
if (reforge.requiresStone && reforge.stonePrice != -1) {
cost = reforge.stonePrice.toDouble()
}
cost *= PriceMultipliers.getForPlayer(player).multiplier
if (!EconomyManager.hasAmount(player, cost)) {
player.sendMessage(plugin.langYml.getMessage("insufficient-money"))
if (plugin.configYml.getBool("gui.insufficient-money-sound.enabled")) {
player.playSound(
player.location,
Sound.valueOf(
plugin.configYml.getString("gui.insufficient-money-sound.id")
.uppercase(Locale.getDefault())
),
1f, plugin.configYml.getDouble("gui.insufficient-money-sound.pitch").toFloat()
)
}
return@onLeftClick
}
}
var xpCost = plugin.configYml.getInt("reforge.xp-cost")
xpCost *= plugin.configYml.getDouble("reforge.cost-exponent").pow(reforges.toDouble()).toInt()
xpCost *= PriceMultipliers.getForPlayer(player).multiplier.toInt()
if (player.level < xpCost) {
player.sendMessage(plugin.langYml.getMessage("insufficient-xp"))
if (plugin.configYml.getBool("gui.insufficient-money-sound.enabled")) {
player.playSound(
player.location,
Sound.valueOf(
plugin.configYml.getString("gui.insufficient-money-sound.id")
.uppercase(Locale.getDefault())
),
1f, plugin.configYml.getDouble("gui.insufficient-money-sound.pitch").toFloat()
)
}
return@onLeftClick
}
if (EconomyManager.hasRegistrations()) {
EconomyManager.removeMoney(player, cost)
}
player.level = player.level - xpCost
player.sendMessage(plugin.langYml.getMessage("applied-reforge").replace("%reforge%", reforge.name))
item.timesReforged++
item.reforge = reforge
if (usedStone) {
val stone = menu.getCaptiveItems(player)[1]
stone.itemMeta = null
stone.amount = 0
if (plugin.configYml.getBool("gui.stone-sound.enabled")) {
player.playSound(
player.location,
Sound.valueOf(
plugin.configYml.getString("gui.stone-sound.id").uppercase(Locale.getDefault())
),
1f, plugin.configYml.getDouble("gui.stone-sound.pitch").toFloat()
)
}
}
if (plugin.configYml.getBool("gui.sound.enabled")) {
player.playSound(
player.location,
Sound.valueOf(plugin.configYml.getString("gui.sound.id").uppercase(Locale.getDefault())),
1f, plugin.configYml.getDouble("gui.sound.pitch").toFloat()
)
}
}
}
defaultPrice = ConfiguredPrice.createOrFree(plugin.configYml.getSubsection("reforge.price"))
val maskPattern = plugin.configYml.getStrings("gui.mask.pattern").toTypedArray()
@@ -229,31 +207,17 @@ object ReforgeGUI {
.toTypedArray()
menu = menu(plugin.configYml.getInt("gui.rows")) {
setTitle(plugin.langYml.getFormattedString("menu.title"))
title = plugin.langYml.getFormattedString("menu.title")
setMask(FillerMask(MaskItems(*maskItems), *maskPattern))
val slot = slot(
ItemStackBuilder(Material.BLACK_STAINED_GLASS_PANE)
.setDisplayName("&r")
.build()
) {
setUpdater { player, menu, _ ->
val status = menu.getReforgeStatus(player).status
if (status == ReforgeStatus.ALLOW || status == ReforgeStatus.ALLOW_STONE) {
Items.lookup(plugin.configYml.getString("gui.show-allowed.allow-material")).item
} else {
Items.lookup(plugin.configYml.getString("gui.show-allowed.deny-material")).item
}
}
}
allowChangingHeldItem()
val allowedPattern = plugin.configYml.getStrings("gui.show-allowed.pattern")
for (i in 1..allowedPattern.size) {
val row = allowedPattern[i - 1]
for (j in 1..9) {
if (row[j - 1] != '0') {
setSlot(i, j, slot)
setSlot(i, j, IndicatorSlot(plugin))
}
}
}
@@ -261,19 +225,21 @@ object ReforgeGUI {
setSlot(
plugin.configYml.getInt("gui.item-slot.row"),
plugin.configYml.getInt("gui.item-slot.column"),
Slot.builder().setCaptive().build()
captiveSlot(),
bindCaptive = itemToReforge
)
setSlot(
plugin.configYml.getInt("gui.stone-slot.row"),
plugin.configYml.getInt("gui.stone-slot.column"),
Slot.builder().setCaptive().build()
captiveSlot(),
bindCaptive = reforgeStone
)
setSlot(
plugin.configYml.getInt("gui.activator-slot.row"),
plugin.configYml.getInt("gui.activator-slot.column"),
activatorSlot
ActivatorSlot(plugin, itemToReforge, reforgeStone)
)
setSlot(
@@ -288,6 +254,60 @@ object ReforgeGUI {
}
)
onEvent<ReforgePriceChangeEvent> { player, menu, _ ->
val status = menu.reforgeStatus[player]
val item = itemToReforge[player]
val reforges = item?.timesReforged ?: 0
var multiplier = if (status.isStonePrice) 1.0 else {
plugin.configYml.getDouble("reforge.cost-exponent")
.pow(reforges.toDouble())
}
multiplier *= player.reforgePriceMultiplier
status.price.setMultiplier(player, multiplier)
}
onEvent<CaptiveItemChangeEvent> { player, menu, _ ->
val item = itemToReforge[player]
val stone = reforgeStone[player]
val targets = mutableListOf<ReforgeTarget>()
var price = defaultPrice
var isStonePrice = false
val status = if (item.isEmpty) {
ReforgeStatus.NO_ITEM
} else {
targets.addAll(ReforgeTargets.getForItem(item))
if (targets.isEmpty()) {
ReforgeStatus.INVALID_ITEM
} else {
val reforgeStone = stone.reforgeStone
if (reforgeStone == null) {
ReforgeStatus.ALLOW
} else {
if (reforgeStone.canBeAppliedTo(item)) {
price = reforgeStone.stonePrice ?: defaultPrice
isStonePrice = true
ReforgeStatus.ALLOW_STONE
} else {
ReforgeStatus.INVALID_ITEM
}
}
}
}
menu.reforgeStatus[player] = ReforgeGUIStatus(status, price, isStonePrice)
menu.callEvent(player, ReforgePriceChangeEvent())
}
onClose { event, menu ->
DropQueue(event.player as Player)
.addItems(menu.getCaptiveItems(event.player as Player))

View File

@@ -1,25 +0,0 @@
package com.willfp.reforges.integrations.talismans
import com.willfp.eco.core.integrations.Integration
import com.willfp.reforges.reforges.ReforgeTarget
import com.willfp.reforges.util.ReforgeLookup
import com.willfp.talismans.talismans.util.TalismanChecks
import org.bukkit.inventory.ItemStack
object TalismansIntegration : Integration {
@JvmStatic
fun registerProvider() {
ReforgeLookup.registerProvider { player ->
val provided = mutableMapOf<ItemStack?, ReforgeTarget.Slot?>()
for (itemStack in TalismanChecks.getTalismanItemsOnPlayer(player)) {
provided[itemStack] = ReforgeTarget.Slot.ANY
}
provided
}
}
override fun getPluginName(): String {
return "Talismans"
}
}

View File

@@ -0,0 +1,33 @@
package com.willfp.reforges.libreforge
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.util.containsIgnoreCase
import com.willfp.libreforge.Dispatcher
import com.willfp.libreforge.NoCompileData
import com.willfp.libreforge.ProvidedHolder
import com.willfp.libreforge.arguments
import com.willfp.libreforge.conditions.Condition
import com.willfp.libreforge.get
import com.willfp.libreforge.getHoldersOfType
import com.willfp.libreforge.toDispatcher
import com.willfp.reforges.reforges.Reforge
import org.bukkit.entity.Player
object ConditionHasReforge : Condition<NoCompileData>("has_reforge") {
override val arguments = arguments {
require("reforge", "You must specify the reforge!")
}
override fun isMet(
dispatcher: Dispatcher<*>,
config: Config,
holder: ProvidedHolder,
compileData: NoCompileData
): Boolean {
val player = dispatcher.get<Player>() ?: return false
return player.toDispatcher().getHoldersOfType<Reforge>()
.map { it.id.key }
.containsIgnoreCase(config.getString("reforge"))
}
}

View File

@@ -1,7 +1,6 @@
package com.willfp.reforges.reforges
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.config.updating.ConfigUpdater
import org.bukkit.entity.Player
@Suppress("UNUSED")
@@ -9,13 +8,6 @@ object PriceMultipliers {
private val REGISTRY = mutableListOf<PriceMultiplier>()
private val NO_MULTIPLIER = PriceMultiplier("none", 1.0, 0)
/**
* Get the permission multiplier for a given player.
*
* @param player The player.
* @return The multiplier.
*/
@JvmStatic
fun getForPlayer(player: Player): PriceMultiplier {
var current = NO_MULTIPLIER
@@ -34,19 +26,15 @@ object PriceMultipliers {
return current
}
/**
* List of all registered multipliers.
*
* @return The multipliers.
*/
@JvmStatic
/** The price multiplier from permissions. */
val Player.reforgePriceMultiplier: Double
get() = getForPlayer(this).multiplier
fun values(): List<PriceMultiplier> {
return REGISTRY.toList()
}
@ConfigUpdater
@JvmStatic
fun update(plugin: EcoPlugin) {
internal fun update(plugin: EcoPlugin) {
REGISTRY.clear()
for (config in plugin.configYml.getSubsections("price-multipliers")) {

View File

@@ -1,43 +1,54 @@
package com.willfp.reforges.reforges
import com.willfp.eco.core.config.config
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.display.Display
import com.willfp.eco.core.items.CustomItem
import com.willfp.eco.core.items.Items
import com.willfp.eco.core.items.builder.ItemStackBuilder
import com.willfp.eco.core.price.ConfiguredPrice
import com.willfp.eco.core.recipe.Recipes
import com.willfp.eco.core.registry.Registrable
import com.willfp.eco.util.StringUtils
import com.willfp.libreforge.Holder
import com.willfp.libreforge.ItemProvidedHolder
import com.willfp.libreforge.ViolationContext
import com.willfp.libreforge.conditions.Conditions
import com.willfp.libreforge.effects.Effects
import com.willfp.libreforge.toDispatcher
import com.willfp.libreforge.triggers.TriggerData
import com.willfp.reforges.ReforgesPlugin
import com.willfp.reforges.util.reforgeStone
import net.kyori.adventure.text.format.TextDecoration
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import java.util.*
import java.util.Objects
@Suppress("DEPRECATION")
class Reforge(
id: String,
internal val config: Config,
plugin: ReforgesPlugin
) : Holder {
override val id = config.getString("id")
) : Holder, Registrable {
val name = config.getFormattedString("name")
val namePrefixComponent = StringUtils.toComponent("$name ").decoration(TextDecoration.ITALIC, false)
val description: List<String> = config.getFormattedStrings("description")
val description: List<String> = config.getStrings("description")
val targets = config.getStrings("targets").mapNotNull { ReforgeTargets.getByName(it) }.toSet()
override val effects = config.getSubsections("effects").mapNotNull {
Effects.compile(it, "Reforge ID $id")
}.toSet()
override val effects = Effects.compile(
config.getSubsections("effects"),
ViolationContext(plugin, "Reforge $id")
)
override val conditions = config.getSubsections("conditions").mapNotNull {
Conditions.compile(it, "Reforge ID $id")
}.toSet()
override val conditions = Conditions.compile(
config.getSubsections("conditions"),
ViolationContext(plugin, "Reforge $id")
)
override val id = plugin.createNamespacedKey(id)
val requiresStone = config.getBool("stone.enabled")
@@ -49,17 +60,34 @@ class Reforge(
}
}.build()
val stonePrice = config.getIntOrNull("stone.price") ?: -1
val stonePrice = if (config.has("stone.price")) {
when {
// Legacy support
config.getDouble("stone.price") > 0 -> {
ConfiguredPrice.createOrFree(
config {
"value" to config.getDouble("stone.price")
"type" to "coins"
"display" to "%value%"
}
)
}
else -> ConfiguredPrice.createOrFree(config.getSubsection("stone.price"))
}
} else null
private val onReforgeEffects = Effects.compileChain(
config.getSubsections("on-reforge-effects"),
ViolationContext(plugin, "Reforge $id").with("on-reforge-effects")
)
init {
Reforges.addNewReforge(this)
stone.reforgeStone = this
Display.display(stone)
if (config.getBool("stone.enabled")) {
CustomItem(
plugin.namespacedKeyFactory.create("stone_" + this.id),
plugin.namespacedKeyFactory.create("stone_" + this.id.key),
{ test -> test.reforgeStone == this },
stone
).register()
@@ -67,7 +95,7 @@ class Reforge(
if (config.getBool("stone.craftable")) {
Recipes.createAndRegisterRecipe(
plugin,
"stone_" + this.id,
"stone_" + this.id.key,
stone,
config.getStrings("stone.recipe")
)
@@ -79,6 +107,20 @@ class Reforge(
return targets.any { target -> target.items.any { it.matches(item) } }
}
fun runOnReforgeEffects(player: Player, item: ItemStack) {
onReforgeEffects?.trigger(
player.toDispatcher(),
TriggerData(
player = player,
item = item
)
)
}
override fun getID(): String {
return this.id.key
}
override fun equals(other: Any?): Boolean {
if (this === other) {
return true
@@ -98,4 +140,4 @@ class Reforge(
override fun toString(): String {
return "Reforge{$id}"
}
}
}

View File

@@ -0,0 +1,16 @@
package com.willfp.reforges.reforges
import com.willfp.libreforge.slot.ItemHolderFinder
import com.willfp.libreforge.slot.SlotType
import com.willfp.reforges.util.reforge
import org.bukkit.inventory.ItemStack
object ReforgeFinder : ItemHolderFinder<Reforge>() {
override fun find(item: ItemStack): List<Reforge> {
return listOfNotNull(item.reforge)
}
override fun isValidInSlot(holder: Reforge, slot: SlotType): Boolean {
return holder.targets.map { it.slot }.any { it.isOrContains(slot) }
}
}

View File

@@ -0,0 +1,16 @@
package com.willfp.reforges.reforges
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.items.tag.CustomItemTag
import com.willfp.reforges.util.reforgeStone
import org.bukkit.inventory.ItemStack
class ReforgeStoneTag(plugin: EcoPlugin): CustomItemTag(plugin.createNamespacedKey("stone")) {
override fun matches(p0: ItemStack): Boolean {
return p0.reforgeStone != null
}
override fun getExampleItem(): ItemStack {
return Reforges.values().random().stone
}
}

View File

@@ -2,12 +2,13 @@ package com.willfp.reforges.reforges
import com.willfp.eco.core.items.TestableItem
import com.willfp.eco.core.recipe.parts.EmptyTestableItem
import com.willfp.libreforge.slot.SlotType
import org.bukkit.inventory.ItemStack
import java.util.*
import java.util.Objects
class ReforgeTarget(
val id: String,
val slot: Slot,
val slot: SlotType,
val items: MutableSet<TestableItem>
) {
init {
@@ -34,10 +35,4 @@ class ReforgeTarget(
override fun hashCode(): Int {
return Objects.hash(this.id)
}
enum class Slot {
HANDS,
ARMOR,
ANY
}
}

View File

@@ -1,52 +1,35 @@
package com.willfp.reforges.reforges
import com.google.common.collect.ImmutableSet
import com.willfp.eco.core.config.updating.ConfigUpdater
import com.willfp.libreforge.slot.impl.SlotTypeAny
import com.willfp.reforges.ReforgesPlugin
import org.bukkit.inventory.ItemStack
object ReforgeTargets {
private val registered = mutableMapOf<String, ReforgeTarget>()
val ALL = ReforgeTarget("all", ReforgeTarget.Slot.ANY, HashSet())
val ALL = ReforgeTarget("all", SlotTypeAny, HashSet())
init {
registered["all"] = ALL
update(ReforgesPlugin.instance)
}
/**
* Get ReforgeTarget matching name.
*
* @param name The name to search for.
* @return The matching ReforgeTarget, or null if not found.
*/
@JvmStatic
fun getByName(name: String): ReforgeTarget? {
return registered[name]
}
/**
* Get target from item.
*
* @param item The item.
* @return The target.
*/
@JvmStatic
fun getForItem(item: ItemStack): List<ReforgeTarget> {
fun getForItem(item: ItemStack?): List<ReforgeTarget> {
if (item == null) {
return emptyList()
}
return registered.values
.filter { !it.id.equals("all", ignoreCase = true) }
.filter { it.matches(item) }
}
/**
* Update all targets.
*
* @param plugin Instance of Reforges.
*/
@ConfigUpdater
@JvmStatic
fun update(plugin: ReforgesPlugin) {
internal fun update(plugin: ReforgesPlugin) {
ALL.items.clear()
for (id in ArrayList(registered.keys)) {
if (id.equals("all", ignoreCase = true)) {
@@ -65,12 +48,6 @@ object ReforgeTargets {
}
}
/**
* Get all targets.
*
* @return A set of all targets.
*/
@JvmStatic
fun values(): Set<ReforgeTarget> {
return ImmutableSet.copyOf(registered.values)
}

View File

@@ -0,0 +1,13 @@
package com.willfp.reforges.reforges
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.items.tag.CustomItemTag
import com.willfp.reforges.util.reforge
import com.willfp.reforges.util.reforgeStone
import org.bukkit.inventory.ItemStack
class ReforgedTag(plugin: EcoPlugin): CustomItemTag(plugin.createNamespacedKey("reforged")) {
override fun matches(p0: ItemStack): Boolean {
return p0.reforge != null
}
}

View File

@@ -1,14 +1,21 @@
package com.willfp.reforges.reforges
import com.google.common.collect.HashBiMap
import com.google.common.collect.ImmutableSet
import com.willfp.eco.core.config.updating.ConfigUpdater
import com.willfp.libreforge.chains.EffectChains
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.registry.Registry
import com.willfp.libreforge.loader.LibreforgePlugin
import com.willfp.libreforge.loader.configs.ConfigCategory
import com.willfp.libreforge.loader.configs.LegacyLocation
import com.willfp.reforges.ReforgesPlugin
@Suppress("UNUSED")
object Reforges {
private val BY_KEY = HashBiMap.create<String, Reforge>()
object Reforges : ConfigCategory("reforge", "reforges") {
private val registry = Registry<Reforge>()
override val legacyLocation = LegacyLocation(
"reforges.yml",
"reforges"
)
/**
* Get all registered [Reforge]s.
@@ -17,17 +24,7 @@ object Reforges {
*/
@JvmStatic
fun values(): Set<Reforge> {
return ImmutableSet.copyOf(BY_KEY.values)
}
/**
* Get [String]s for all registered [Reforge]s.
*
* @return A list of all [Reforge]s.
*/
@JvmStatic
fun keySet(): Set<String> {
return ImmutableSet.copyOf(BY_KEY.keys)
return ImmutableSet.copyOf(registry.values())
}
/**
@@ -40,47 +37,14 @@ object Reforges {
fun getByKey(key: String?): Reforge? {
return if (key == null) {
null
} else BY_KEY[key]
} else registry[key]
}
/**
* Update all [Reforge]s.
*
* @param plugin Instance of Reforges.
*/
@ConfigUpdater
@JvmStatic
fun update(plugin: ReforgesPlugin) {
for (config in plugin.reforgesYml.getSubsections("chains")) {
EffectChains.compile(config, "Chains")
}
for (reforge in values()) {
removeReforge(reforge)
}
for (config in plugin.reforgesYml.getSubsections("reforges")) {
Reforge(config, plugin)
}
override fun clear(plugin: LibreforgePlugin) {
registry.clear()
}
/**
* Remove [Reforge] from Reforges.
*
* @param reforge The [Reforge] to remove.
*/
@JvmStatic
fun removeReforge(reforge: Reforge) {
BY_KEY.remove(reforge.id)
}
/**
* Add new [Reforge] to Reforges.
*
* Only for internal use, reforges are automatically added in the constructor.
*
* @param reforge The [Reforge] to add.
*/
internal fun addNewReforge(reforge: Reforge) {
BY_KEY.remove(reforge.id)
BY_KEY[reforge.id] = reforge
override fun acceptConfig(plugin: LibreforgePlugin, id: String, config: Config) {
registry.register(Reforge(id, config, plugin as ReforgesPlugin))
}
}

View File

@@ -1,5 +0,0 @@
package com.willfp.reforges.reforges.util
import com.willfp.reforges.util.ReforgeStatus
data class MetadatedReforgeStatus(val status: ReforgeStatus, val cost: Double)

View File

@@ -8,7 +8,7 @@ import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.ItemMeta
import java.util.function.Predicate
class ReforgeArgParser : LookupArgParser {
object ReforgeArgParser : LookupArgParser {
override fun parseArguments(
args: Array<String>,
meta: ItemMeta

View File

@@ -1,84 +0,0 @@
package com.willfp.reforges.util
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.events.ArmorChangeEvent
import com.willfp.libreforge.updateEffects
import com.willfp.reforges.reforges.ReforgeTargets
import com.willfp.reforges.reforges.Reforges.values
import com.willfp.reforges.util.ReforgeLookup.clearCache
import org.bukkit.entity.Player
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
import org.bukkit.event.entity.EntityPickupItemEvent
import org.bukkit.event.inventory.InventoryClickEvent
import org.bukkit.event.player.PlayerDropItemEvent
import org.bukkit.event.player.PlayerItemHeldEvent
import org.bukkit.event.player.PlayerJoinEvent
import org.bukkit.event.player.PlayerQuitEvent
@Suppress("UNUSED", "UNUSED_PARAMETER")
class ReforgeEnableListeners(private val plugin: EcoPlugin) : Listener {
@EventHandler
fun onItemPickup(event: EntityPickupItemEvent) {
if (event.entity !is Player) {
return
}
val player = event.entity as Player
if (!ReforgeTargets.ALL.matches(event.item.itemStack)) {
return
}
refreshPlayer(player)
}
@EventHandler
fun onPlayerJoin(event: PlayerJoinEvent) {
refresh()
}
@EventHandler
fun onPlayerLeave(event: PlayerQuitEvent) {
refresh()
val player = event.player
for (value in values()) {
for ((effect) in value.effects) {
effect.disableForPlayer(player)
}
}
}
@EventHandler
fun onInventoryDrop(event: PlayerDropItemEvent) {
if (!ReforgeTargets.ALL.matches(event.itemDrop.itemStack)) {
return
}
refreshPlayer(event.player)
}
@EventHandler
fun onChangeSlot(event: PlayerItemHeldEvent) {
refreshPlayer(event.player)
plugin.scheduler.run { refreshPlayer(event.player) }
}
@EventHandler
fun onArmorChange(event: ArmorChangeEvent) {
refreshPlayer(event.player)
}
@EventHandler
fun onInventoryClick(event: InventoryClickEvent) {
if (event.whoClicked !is Player) {
return
}
refreshPlayer(event.whoClicked as Player)
}
private fun refresh() {
plugin.server.onlinePlayers.forEach { player: Player -> refreshPlayer(player) }
}
private fun refreshPlayer(player: Player) {
clearCache(player)
player.updateEffects()
}
}

View File

@@ -1,106 +0,0 @@
package com.willfp.reforges.util
import com.github.benmanes.caffeine.cache.Caffeine
import com.willfp.reforges.ReforgesPlugin
import com.willfp.reforges.reforges.Reforge
import com.willfp.reforges.reforges.ReforgeTarget
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import java.util.concurrent.TimeUnit
typealias SlotProvider = (Player) -> Map<ItemStack?, ReforgeTarget.Slot?>
object ReforgeLookup {
private val plugin = ReforgesPlugin.instance
private val slotProviders = mutableSetOf<(Player) -> Map<ItemStack, ReforgeTarget.Slot>>()
private val itemCache = Caffeine.newBuilder()
.expireAfterWrite(2, TimeUnit.SECONDS)
.build<Player, Map<ItemStack, ReforgeTarget.Slot>>()
private val reforgeCache = Caffeine.newBuilder()
.expireAfterWrite(2, TimeUnit.SECONDS)
.build<Player, Collection<Reforge>>()
@JvmStatic
fun registerProvider(provider: SlotProvider) {
slotProviders.add {
val found = mutableMapOf<ItemStack, ReforgeTarget.Slot>()
for ((item, slot) in provider(it)) {
if (item != null && slot != null) {
found[item] = slot
}
}
found
}
}
private fun provide(player: Player): Map<ItemStack, ReforgeTarget.Slot> {
return itemCache.get(player) {
val found = mutableMapOf<ItemStack, ReforgeTarget.Slot>()
for (provider in slotProviders) {
found.putAll(provider(player))
}
found
}
}
fun provideReforges(player: Player): List<Reforge> {
return reforgeCache.get(player) {
val found = mutableListOf<Reforge>()
for ((itemStack, slot) in provide(player)) {
val reforge = itemStack.reforge ?: continue
if (slot != ReforgeTarget.Slot.ANY) {
if (!reforge.targets.map { it.slot }.contains(slot)) {
continue
}
}
found.add(reforge)
}
found
}.toList()
}
/**
* Clear cache.
*
* @param player The player.
*/
@JvmStatic
fun clearCache(player: Player) {
itemCache.invalidate(player)
reforgeCache.invalidate(player)
}
init {
registerProvider {
mapOf(
Pair(
it.inventory.itemInMainHand,
ReforgeTarget.Slot.HANDS
)
)
}
if (!plugin.configYml.getBool("no-offhand")) {
registerProvider {
mapOf(
Pair(
it.inventory.itemInOffHand,
ReforgeTarget.Slot.HANDS
)
)
}
}
registerProvider {
val items = mutableMapOf<ItemStack?, ReforgeTarget.Slot?>()
for (stack in it.inventory.armorContents) {
items[stack] = ReforgeTarget.Slot.ARMOR
}
items
}
}
}

View File

@@ -51,7 +51,7 @@ var PersistentDataContainer?.reforge: Reforge?
if (value == null) {
this.remove(reforgeKey)
} else {
this.set(reforgeKey, PersistentDataType.STRING, value.id)
this.set(reforgeKey, PersistentDataType.STRING, value.id.key)
}
}
@@ -91,7 +91,7 @@ var PersistentDataContainer?.reforgeStone: Reforge?
if (value == null) {
this.remove(reforgeStoneKey)
} else {
this.set(reforgeStoneKey, PersistentDataType.STRING, value.id)
this.set(reforgeStoneKey, PersistentDataType.STRING, value.id.key)
}
}

View File

@@ -74,10 +74,6 @@ gui:
row: 6
column: 5
# Placeholders:
# %cost% - The economy cost
# %xp% - The levels required
allow:
material: anvil
name: "&aReforge Item"
@@ -86,8 +82,8 @@ gui:
- '&7it a random item modifier that'
- '&7boosts its stats.'
- ''
- '&7Cost'
- '&6\$%cost%'
- '&7Price:'
- '%price%'
- ''
- '&eClick to reforge!'
allow-stone:
@@ -99,8 +95,8 @@ gui:
- '&7the %stone%&7 reforge to'
- '&7boost its stats.'
- ''
- '&7Cost'
- '&6\$%cost%'
- '&7Price:'
- '%price%'
- ''
- '&eClick to reforge!'
no-item:
@@ -138,9 +134,11 @@ gui:
pitch: 0.8
reforge:
cost: 7500
xp-cost: 0 # In levels
use-player-points: false
# See here: https://plugins.auxilor.io/all-plugins/prices
price:
value: 7500
type: coins
display: "&6$%value%"
cost-exponent: 1.15 # (Reforges done ^ cost exponent) * cost
@@ -148,51 +146,11 @@ reforge:
reforgable-suffix:
- ""
- "&8This item can be reforged!"
no-reforgable-in-gui: true # Not perfect, won't work 100% of the time
# due to how GUIs are handled differently in different plugins, but should help.
display-in-lore: true
display-in-name: true
# The lore to display if an item is reforged, above the reforge description
reforged-prefix:
- ""
- "%reforge%"
cooldown:
in-actionbar: true
sound:
enabled: true
sound: "BLOCK_NOTE_BLOCK_PLING"
pitch: 0.5
cannot-afford:
in-actionbar: true
sound:
enabled: true
sound: "BLOCK_NOTE_BLOCK_PLING"
pitch: 0.5
cannot-afford-type:
in-actionbar: true
sound:
enabled: true
sound: "BLOCK_NOTE_BLOCK_PLING"
pitch: 0.5
point-names: # If you have point names that look ugly (eg g_souls) then you can map them to nice names to be shown to players.
example_point: "Nicely Formatted Point"
use-faster-move-trigger: true # Disable if you want move trigger to detect sub-1-block movements
raytrace-distance: 80 # The distance that alt_click should check for a location
block-item-drop-place-check: true # If the block_item_drop trigger should only fire on naturally placed blocks (prevents dupes)
potions:
icon:
permanent: true
triggered: true
ambient:
permanent: false
triggered: true
particles:
permanent: false
triggered: true

View File

@@ -1,3 +1,9 @@
resource-id: 1330
bstats-id: 12412
color: "&3"
environment:
- name: libreforge version
value: ${libreforgeVersion}
options:
resource-id: 1330
bstats-id: 12412
color: "&3"
uses-reflective-reload: false

View File

@@ -3,21 +3,16 @@ messages:
no-permission: "&cYou don't have permission to do this!"
not-player: "&cThis command must be run by a player"
invalid-command: "&cUnknown subcommand!"
reloaded: "Reloaded! (Restart if you're removed reforges!) Took %time%ms"
insufficient-money: "&cYou don't have enough money for this!"
insufficient-xp: "&cYou don't have enough xp levels for this!"
reloaded: "Reloaded!"
applied-reforge: "Applied %reforge%&r reforge!"
needs-player: "&cYou must specify a player"
invalid-player: "&cInvalid player!"
needs-stone: "&cYou must specify a reforge stone"
invalid-stone: "&cInvalid reforge!"
give-success: "Gave &a%reforge%&r reforge stone to &a%recipient%"
on-cooldown: "&cThis reforge is on cooldown! &fTime left: &a%seconds% seconds"
cannot-afford: "&cYou can't afford to do this! &fCost: &a$$%cost%"
cannot-afford-type: "&cYou can't afford to do this! &fCost: &a%cost% %type%"
invalid-reforge: "&cInvalid reforge!"
needs-reforge: "&cYou must specify a reforge"
cannot-transmit: "&cYou can't transmit here!"
menu:
title: "Reforge Item"

View File

@@ -1,26 +1,13 @@
name: Reforges
version: ${projectVersion}
name: ${pluginName}
version: ${version}
main: com.willfp.reforges.ReforgesPlugin
api-version: 1.16
api-version: 1.17
authors: [ Auxilor ]
website: willfp.com
load: STARTUP
depend:
- eco
- ProtocolLib
softdepend:
- Vault
- AureliumSkills
- PlayerPoints
- Jobs
- TMMobcoins
- EcoEnchants
- EcoBosses
- Talismans
- EcoArmor
- EcoItems
- EcoSkills
- Boosters
- libreforge
commands:
reforges:

View File

@@ -1,405 +0,0 @@
chains:
- id: example_chain
effects:
- id: teleport
- id: potion_effect
args:
effect: blindness
level: 3
duration: 30
apply_to_player: true
- id: send_message
args:
message: "&fYou have been teleported!"
action_bar: true
- id: play_sound
args:
sound: entity_dragon_fireball_explode
pitch: 1.5
volume: 4
reforges:
- id: acute
name: "<gradient:#4776E6>Acute</gradient:#8E54E9>"
description:
- "&a+2% &fTriple Damage Chance"
targets:
- axe
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 3
chance: 2
triggers:
- melee_attack
conditions: []
- id: aerobic
name: "<gradient:#B993D6>Aerobic</gradient:#8CA6DB>"
description:
- "&a+9% &fDamage when shot in air"
targets:
- bow
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.09
triggers:
- bow_attack
conditions:
- id: in_air
args:
in_air: true
- id: dynamic
name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>"
description:
- "&a+5% &fDamage"
- "&a+10% &fCrit Damage"
targets:
- melee
stone:
enabled: true
name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&f Reforge Stone"
lore:
- "&7Place on the right of the"
- "&7reforge menu to apply the"
- "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&7 reforge!"
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmM0YTY1YzY4OWIyZDM2NDA5MTAwYTYwYzJhYjhkM2QwYTY3Y2U5NGVlYTNjMWY3YWM5NzRmZDg5MzU2OGI1ZCJ9fX0=
craftable: true
recipe:
- air
- ecoitems:blank_reforge_stone ? air
- air
- iron_block
- daylight_sensor
- iron_block
- air
- phantom_membrane
- air
effects:
- id: damage_multiplier
args:
multiplier: 1.05
triggers:
- melee_attack
- id: crit_multiplier
args:
multiplier: 1.1
triggers:
- melee_attack
conditions: []
- id: evasive
name: "<gradient:#EFEFBB>Evasive</gradient:#D4D3DD>"
description:
- "&a+2% &fIgnore Damage Chance"
targets:
- armor
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 0
chance: 2
triggers:
- take_damage
conditions: []
- id: gravitated
name: "<gradient:#1e3c72>Gravitated</gradient:#2a5298>"
description:
- "&a+8% &fCritical Damage"
targets:
- melee
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: crit_multiplier
args:
multiplier: 1.08
triggers:
- melee_attack
conditions: []
- id: light
name: "<gradient:#1c92d2>Light</gradient:#f2fcfe>"
description:
- "&c-5% &fDamage"
- "&c-5% &fKnockback"
- "&a+10% &fAttack Speed"
targets:
- melee
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 0.95
triggers:
- melee_attack
- id: knockback_multiplier
args:
multiplier: 0.95
- id: attack_speed_multiplier
args:
multiplier: 1.1
conditions: []
- id: nautical
name: "<gradient:#373B44>Nautical</gradient:#4286f4>"
description:
- "&a+20% &fDamage in water"
targets:
- melee
- bow
- trident
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.2
triggers:
- melee_attack
- bow_attack
- trident_attack
conditions:
- id: in_water
args:
in_water: true
- id: pointy
name: "<gradient:#076585>Pointy</gradient:#ffffff>"
description:
- "&a+10% &fDamage"
targets:
- trident
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.1
triggers:
- trident_attack
conditions: []
- id: prospecting
name: "<gradient:#00B4DB>Prospecting</gradient:#0083B0>"
description:
- "&a+5% &fChance to get &e$$2&f for mining a block"
targets:
- pickaxe
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: give_money
args:
amount: 2
chance: 5
triggers:
- mine_block
conditions: []
- id: reinforced
name: "<gradient:#FBD786>Reinforced</gradient:#f7797d>"
description:
- "&a+4% &fDamage Resistance"
targets:
- armor
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 0.96
triggers:
- take_damage
conditions: []
- id: rich
name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>"
description:
- "&a+$$50 &fFor each mob kill"
targets:
- trident
- bow
stone:
enabled: true
name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&f Reforge Stone"
lore:
- "&7Place on the right of the"
- "&7reforge menu to apply the"
- "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&7 reforge!"
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2RjNTdjNzVhZGYzOWVjNmYwZTA5MTYwNDlkZDk2NzFlOThhOGExZTYwMDEwNGU4NGU2NDVjOTg4OTUwYmQ3In19fQ==
craftable: true
recipe:
- gold_block
- trident
- gold_block
- air
- ecoitems:blank_reforge_stone ? obsidian
- air
- gold_block
- bow
- gold_block
effects:
- id: give_money
args:
amount: 50
triggers:
- kill
conditions: []
- id: sharp
name: "<gradient:#f12711>Sharp</gradient:#f5af19>"
description:
- "&a+3% &fDamage"
targets:
- melee
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.03
triggers:
- melee_attack
conditions: []
- id: streamlined
name: "<gradient:#74ebd5>Streamlined</gradient:#ACB6E5>"
description:
- "&a+4% &fDamage"
targets:
- bow
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.04
triggers:
- bow_attack
conditions: []
- id: strong
name: "<gradient:#ED213A>Strong</gradient:#93291E>"
description:
- "&a+2% &fDamage"
- "&a+10% &fKnockback"
targets:
- melee
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.02
triggers:
- melee_attack
- id: knockback_multiplier
args:
multiplier: 1.1
conditions: []
- id: thin
name: "<gradient:#D1913C>Thin</gradient:#FFD194>"
description:
- "&c-5% &fDamage Resistance"
- "&a+2.5% &fMovement Speed"
targets:
- armor
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.05
triggers:
- take_damage
- id: movement_speed_multiplier
args:
multiplier: 1.025
conditions: []
- id: tough
name: "<gradient:#a73737>Tough</gradient:#7a2828>"
description:
- "&c+8% &fDamage Resistance"
- "&a-5% &fMovement Speed"
targets:
- armor
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 0.92
triggers:
- take_damage
- id: movement_speed_multiplier
args:
multiplier: 0.95
conditions: []

View File

@@ -0,0 +1,59 @@
# The ID of the reforge is the name of the .yml file,
# for example acute.yml has the ID of acute
# You can place reforges anywhere in this folder,
# including in subfolders if you want to organize your reforge configs
# _example.yml is not loaded.
name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>" # The display name for the reforge
description: # The lore to add to an item with this reforge:
- "&a+5% &fDamage"
- "&a+10% &fCrit Damage"
targets: # The targets that this reforge can be applied to
- melee
# Options for the reforge stone
stone:
enabled: true # If this reforge requires the use of a reforge stone
name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&f Reforge Stone" # The display name of the stone
lore: # The lore of the stone
- "&7Place on the right of the"
- "&7reforge menu to apply the"
- "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&7 reforge!"
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmM0YTY1YzY4OWIyZDM2NDA5MTAwYTYwYzJhYjhkM2QwYTY3Y2U5NGVlYTNjMWY3YWM5NzRmZDg5MzU2OGI1ZCJ9fX0=
craftable: true # If the reforge stone should be craftable
price: # (Optional) The price required to apply this reforge, overrides the default reforge price
value: 100000
type: coins # See here: https://plugins.auxilor.io/all-plugins/prices
display: "&6$%value%"
recipe: # The recipe for the stone to have
- air
- ecoitems:blank_reforge_stone ? air
- air
- iron_block
- daylight_sensor
- iron_block
- air
- phantom_membrane
- air
# The effects of the reforge (i.e. the functionality)
# See here: https://plugins.auxilor.io/effects/configuring-an-effect
effects:
- id: damage_multiplier
args:
multiplier: 1.05
triggers:
- melee_attack
- id: crit_multiplier
args:
multiplier: 1.1
triggers:
- melee_attack
# The conditions required to use the reforge
conditions: [ ]
# Effects to run when the reforge is applied to an item.
on-reforge-effects: [ ]

View File

@@ -0,0 +1,17 @@
name: "<gradient:#4776E6>Acute</gradient:#8E54E9>"
description:
- "&a+2% &fTriple Damage Chance"
targets:
- axe
effects:
- id: damage_multiplier
args:
multiplier: 3
chance: 2
triggers:
- melee_attack
conditions: []

View File

@@ -0,0 +1,19 @@
name: "<gradient:#B993D6>Aerobic</gradient:#8CA6DB>"
description:
- "&a+9% &fDamage when shot in air"
targets:
- bow
effects:
- id: damage_multiplier
args:
multiplier: 1.09
triggers:
- bow_attack
conditions:
- id: in_air
args:
in_air: true

View File

@@ -0,0 +1,48 @@
name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>"
description:
- "&a+5% &fDamage"
- "&a+10% &fCrit Damage"
targets:
- melee
stone:
enabled: true
name: "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&f Reforge Stone"
lore:
- "&7Place on the right of the"
- "&7reforge menu to apply the"
- "<gradient:#AAFFA9>Dynamic</gradient:#11FFBD>&7 reforge!"
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmM0YTY1YzY4OWIyZDM2NDA5MTAwYTYwYzJhYjhkM2QwYTY3Y2U5NGVlYTNjMWY3YWM5NzRmZDg5MzU2OGI1ZCJ9fX0=
craftable: true
price:
value: 100000
type: coins
display: "&6$%value%"
recipe:
- air
- ecoitems:blank_reforge_stone ? air
- air
- iron_block
- daylight_sensor
- iron_block
- air
- phantom_membrane
- air
effects:
- id: damage_multiplier
args:
multiplier: 1.05
triggers:
- melee_attack
- id: crit_multiplier
args:
multiplier: 1.1
triggers:
- melee_attack
conditions: []

View File

@@ -0,0 +1,17 @@
name: "<gradient:#EFEFBB>Evasive</gradient:#D4D3DD>"
description:
- "&a+2% &fIgnore Damage Chance"
targets:
- armor
effects:
- id: damage_multiplier
args:
multiplier: 0
chance: 2
triggers:
- take_damage
conditions: []

View File

@@ -0,0 +1,16 @@
name: "<gradient:#1e3c72>Gravitated</gradient:#2a5298>"
description:
- "&a+8% &fCritical Damage"
targets:
- melee
effects:
- id: crit_multiplier
args:
multiplier: 1.08
triggers:
- melee_attack
conditions: []

View File

@@ -0,0 +1,24 @@
name: "<gradient:#1c92d2>Light</gradient:#f2fcfe>"
description:
- "&c-5% &fDamage"
- "&c-5% &fKnockback"
- "&a+10% &fAttack Speed"
targets:
- melee
effects:
- id: damage_multiplier
args:
multiplier: 0.95
triggers:
- melee_attack
- id: knockback_multiplier
args:
multiplier: 0.95
- id: attack_speed_multiplier
args:
multiplier: 1.1
conditions: []

View File

@@ -0,0 +1,23 @@
name: "<gradient:#373B44>Nautical</gradient:#4286f4>"
description:
- "&a+20% &fDamage in water"
targets:
- melee
- bow
- trident
effects:
- id: damage_multiplier
args:
multiplier: 1.2
triggers:
- melee_attack
- bow_attack
- trident_attack
conditions:
- id: in_water
args:
in_water: true

View File

@@ -0,0 +1,16 @@
name: "<gradient:#076585>Pointy</gradient:#ffffff>"
description:
- "&a+10% &fDamage"
targets:
- trident
effects:
- id: damage_multiplier
args:
multiplier: 1.1
triggers:
- trident_attack
conditions: []

View File

@@ -0,0 +1,17 @@
name: "<gradient:#00B4DB>Prospecting</gradient:#0083B0>"
description:
- "&a+5% &fChance to get &e$$2&f for mining a block"
targets:
- pickaxe
effects:
- id: give_money
args:
amount: 2
chance: 5
triggers:
- mine_block
conditions: []

View File

@@ -0,0 +1,16 @@
name: "<gradient:#FBD786>Reinforced</gradient:#f7797d>"
description:
- "&a+4% &fDamage Resistance"
targets:
- armor
effects:
- id: damage_multiplier
args:
multiplier: 0.96
triggers:
- take_damage
conditions: []

View File

@@ -0,0 +1,37 @@
name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>"
description:
- "&a+$$50 &fFor each mob kill"
targets:
- trident
- bow
stone:
enabled: true
name: "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&f Reforge Stone"
lore:
- "&7Place on the right of the"
- "&7reforge menu to apply the"
- "<gradient:#DBDBDB>Rich</gradient:#F2F2F2>&7 reforge!"
item: player_head texture:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2RjNTdjNzVhZGYzOWVjNmYwZTA5MTYwNDlkZDk2NzFlOThhOGExZTYwMDEwNGU4NGU2NDVjOTg4OTUwYmQ3In19fQ==
craftable: true
recipe:
- gold_block
- trident
- gold_block
- air
- ecoitems:blank_reforge_stone ? obsidian
- air
- gold_block
- bow
- gold_block
effects:
- id: give_money
args:
amount: 50
triggers:
- kill
conditions: []

View File

@@ -0,0 +1,21 @@
name: "<gradient:#f12711>Sharp</gradient:#f5af19>"
description:
- "&a+3% &fDamage"
targets:
- melee
stone:
enabled: false
name: ''
lore: []
item: ''
craftable: false
recipe: []
effects:
- id: damage_multiplier
args:
multiplier: 1.03
triggers:
- melee_attack
conditions: []

View File

@@ -0,0 +1,16 @@
name: "<gradient:#74ebd5>Streamlined</gradient:#ACB6E5>"
description:
- "&a+4% &fDamage"
targets:
- bow
effects:
- id: damage_multiplier
args:
multiplier: 1.04
triggers:
- bow_attack
conditions: []

View File

@@ -0,0 +1,20 @@
name: "<gradient:#ED213A>Strong</gradient:#93291E>"
description:
- "&a+2% &fDamage"
- "&a+10% &fKnockback"
targets:
- melee
effects:
- id: damage_multiplier
args:
multiplier: 1.02
triggers:
- melee_attack
- id: knockback_multiplier
args:
multiplier: 1.1
conditions: []

View File

@@ -0,0 +1,20 @@
name: "<gradient:#D1913C>Thin</gradient:#FFD194>"
description:
- "&c-5% &fDamage Resistance"
- "&a+2.5% &fMovement Speed"
targets:
- armor
effects:
- id: damage_multiplier
args:
multiplier: 1.05
triggers:
- take_damage
- id: movement_speed_multiplier
args:
multiplier: 1.025
conditions: []

View File

@@ -0,0 +1,20 @@
name: "<gradient:#a73737>Tough</gradient:#7a2828>"
description:
- "&c+8% &fDamage Resistance"
- "&a-5% &fMovement Speed"
targets:
- armor
effects:
- id: damage_multiplier
args:
multiplier: 0.92
triggers:
- take_damage
- id: movement_speed_multiplier
args:
multiplier: 0.95
conditions: []

View File

@@ -1,45 +1,27 @@
#
# A target consists of items and a slot.
# The slot is either hands, armor, or any.
# Hands means the reforge will activate on hands, armor
# means it will only work on armor, and any
# means it will activate whenever its on the player.
#
# The options for slot are mainhand, offhand, hands, helmet, chestplate,
# leggings, boots, armor, any, a number from 0-40 (to specify an exact slot),
# or a list of slots like "9, 10, 11, mainhand"
pickaxe:
slot: hands
items:
- wooden_pickaxe
- stone_pickaxe
- iron_pickaxe
- golden_pickaxe
- diamond_pickaxe
- netherite_pickaxe
- "#items_pickaxes"
axe:
slot: hands
items:
- wooden_axe
- stone_axe
- iron_axe
- golden_axe
- diamond_axe
- netherite_axe
- "#items_axes"
melee:
slot: hands
items:
- wooden_axe
- stone_axe
- iron_axe
- golden_axe
- diamond_axe
- netherite_axe
- wooden_sword
- stone_sword
- iron_sword
- golden_sword
- diamond_sword
- netherite_sword
- "#items_axes"
- "#items_swords"
trident:
slot: hands
items:
@@ -52,31 +34,7 @@ bow:
armor:
slot: armor
items:
- turtle_helmet
- leather_helmet
- chainmail_helmet
- iron_helmet
- golden_helmet
- diamond_helmet
- netherite_helmet
- leather_chestplate
- chainmail_chestplate
- iron_chestplate
- golden_chestplate
- diamond_chestplate
- netherite_chestplate
- leather_leggings
- chainmail_leggings
- iron_leggings
- golden_leggings
- diamond_leggings
- netherite_leggings
- leather_boots
- chainmail_boots
- iron_boots
- golden_boots
- diamond_boots
- netherite_boots
- "#items_head_armor"
- "#items_chest_armor"
- "#items_leg_armor"
- "#items_foot_armor"

View File

@@ -1,4 +1,5 @@
#libreforge-updater
#Tue Jul 05 18:33:18 BST 2022
version=5.23.1
plugin-name=Reforges
#Mon Oct 06 08:56:44 BST 2025
kotlin.code.style=official
libreforge-version=4.79.0
version=6.78.0

Binary file not shown.

View File

@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

269
gradlew vendored
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env sh
#!/bin/sh
#
# Copyright 2015 the original author or authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
MAX_FD=maximum
warn () {
echo "$*"
}
} >&2
die () {
echo
echo "$*"
echo
exit 1
}
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

View File

@@ -1,6 +0,0 @@
jdk: openjdk17
before_install:
- source "$HOME/.sdkman/bin/sdkman-init.sh"
- sdk update
- sdk install java 17.0.1-tem
- sdk use java 17.0.1-tem

View File

@@ -1,5 +0,0 @@
rootProject.name = 'Reforges'
// Core
include ':eco-core'
include ':eco-core:core-plugin'

16
settings.gradle.kts Normal file
View File

@@ -0,0 +1,16 @@
pluginManagement {
repositories {
gradlePluginPortal()
mavenLocal()
maven("https://repo.auxilor.io/repository/maven-public/")
maven("https://repo.papermc.io/repository/maven-public/")
}
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
// Core
include(":eco-core")
include(":eco-core:core-plugin")