From 9024da335bc40d511514056c3f26d274724802bc Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Wed, 10 Aug 2022 22:49:53 -0400 Subject: [PATCH 01/11] Update gradle.properties updated version number (just for personal testing and maybe a build) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 654040c..4f38e0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.java.home=C:/Program Files/Java/jdk-17.0.2 loader_version=0.14.6 # Mod Properties - mod_version = 1.0.6 + mod_version = 1.0.7 maven_group = com.aspects archives_base_name = aspects origins_version=v1.4.1 From 612ea37e87d3cf442b7e9dbbf1e38a2a99e89d82 Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Wed, 10 Aug 2022 22:51:26 -0400 Subject: [PATCH 02/11] fixed randomly dying (figued out it was mainly by fall damage) its fixed however this fix removes stuff --- .../aspects/powers/negate_fall_damage.json | 297 +----------------- 1 file changed, 13 insertions(+), 284 deletions(-) diff --git a/src/main/resources/data/aspects/powers/negate_fall_damage.json b/src/main/resources/data/aspects/powers/negate_fall_damage.json index 6379c16..004407d 100644 --- a/src/main/resources/data/aspects/powers/negate_fall_damage.json +++ b/src/main/resources/data/aspects/powers/negate_fall_damage.json @@ -1,298 +1,27 @@ -{ +{ "type": "origins:multiple", - - "slowness_when_fall1": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 0, - "duration": 100 - } - }, + "fall_immunity": { + "type": "origins:invulnerability", "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 3.0 - } - ] + "type": "origins:name", + "name": "fall" }, - "cooldown": 20 + "cooldown": 1 }, - "slowness_when_flyintowall1": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 0, - "duration": 100 - } - }, + "kinetic_immunity": { + "type": "origins:invulnerability", "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 3.0 - } - ] + "type": "origins:name", + "name": "flyIntoWall" }, - "cooldown": 20 - }, - - "slowness_when_fall3": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 1, - "duration": 100 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 6.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall3": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 1, - "duration": 100 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 6.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall5": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 2, - "duration": 120 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 10.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall5": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 2, - "duration": 120 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 10.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall7": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 3, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 14.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall7": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 3, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 14.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall9": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 4, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 18.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall9": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 4, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 18.0 - } - ] - }, - "cooldown": 20 - }, - - "reduced_kinetic_damage": { - "type": "origins:modify_damage_taken", - "modifier": { - "name": "More kinetic damage taken", - "value": -99999, - "operation": "multiply_base" - }, - "damage_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:name", - "name": "flyIntoWall" - } - ] - } + "cooldown": 1 }, "name":"Negate Falling", - "description":"You cannot take fall damage, but the more fall damage that is absorbed by the atmosphere, the more your movement speed will temporarily decrease.", + "description":"You cannot take fall damage.", "badges": [ { "sprite": "aspects:textures/gui/badge/equal.png", "text": "Neutral" } - ] + ] } \ No newline at end of file From 5554fc32898dd6c1e6a0cec4885ef6fa5937dd18 Mon Sep 17 00:00:00 2001 From: Azure <80689879+AbyssDweller@users.noreply.github.com> Date: Wed, 10 Aug 2022 23:03:19 -0400 Subject: [PATCH 03/11] added credits --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5a30156..b04eb81 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,6 @@ Aspects is an element-based Origins addon, meaning it expands the functions and - [Origins](https://www.curseforge.com/minecraft/mc-mods/origins) - [Origins Extra Keybinds](https://www.curseforge.com/minecraft/mc-mods/origins-extra-keybinds) +### Credits to Perseus#0745 on discord for some of the fixes + + From f965ccaf8f287eb4e9b7b05826eecb7bd9e6439f Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Wed, 10 Aug 2022 23:09:30 -0400 Subject: [PATCH 04/11] whatever this is lol --- .gradle/7.3.1/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/7.3.1/checksums/md5-checksums.bin | Bin 74515 -> 77415 bytes .gradle/7.3.1/checksums/sha1-checksums.bin | Bin 165635 -> 168767 bytes .../executionHistory/executionHistory.bin | Bin 389613 -> 389613 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/7.3.1/fileHashes/fileHashes.bin | Bin 85215 -> 128733 bytes .gradle/7.3.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.3.1/fileHashes/resourceHashesCache.bin | Bin 30703 -> 34715 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 19829 -> 20279 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .gradle/loom-cache/launch.cfg | 10 +- .gradle/loom-cache/remapClasspath.txt | 2 +- .../aspects/powers/negate_fall_damage.json | 297 +----------------- build/resources/main/fabric.mod.json | 2 +- 15 files changed, 20 insertions(+), 291 deletions(-) diff --git a/.gradle/7.3.1/checksums/checksums.lock b/.gradle/7.3.1/checksums/checksums.lock index 8e3bd69b17a6b830328a58b10541f43fb483258e..285c5237af3a9e71a7d4266e160de4641ebdc622 100644 GIT binary patch literal 17 VcmZR+KQ+jmaqc~BHb6vmkaLt%g(!~+I7R@j46kV8>XQ3MYTQ4DwhSyNaN#UloFMZ%#3(c-ez zmV`s1s3c}zL)hs$k7fIrHv`y=}#W)f5AZyOEF zUG_)*nv+J@c9?Ff0y|B|Uo5TtNLVW?VLlhhi-$79ruob3F?D?^ymVql@?xcJZ4Blz zPnbSa1rBN}y4#;QVCH5ACH5*1^hx2s&2LNy>tmbkX^Q?1hKO?-y%RB&1j2TQOuF=+ zMV#e6nOifx3fa3uCFC zWMeQV^lb6biZBeNqfpVS0n56g;T9#ChExN^dJS0ZU@=~9v>fYP+F8Bcl>&>`Cd3*0 zk@{T4km^%`qJl+U)mJxTp--z@E9=Xh}ln^;ycfM=_Kp!Jv7WwEV*%d-K_cwHP{gu~~yk z5%8>c>WmC3#LzQ^H9U=@=pgS0Z2@8(dE9j!41T5ux9wE(`!i-@rTa9Pzc7$p`@EI{ zY4OGH$7kHa2eP-&Vv!!KPKi~2Ju8ohuduq8XDND3(U5j5KIbiYYynJutpPE|Kiq2R zup+Di_AC*@RfZxk$tNIgA$x#iErvQn3Am#+FF9E+#mr?7s~F<4CO!@*)tPNwNiyi* z$eUVPk#hfH_O(qm7`mz0%73|i_&L|+94vPy_ZLHII1qHjSA9RZB?vQ*4(Kzi0a*(| z-uUc3h?)E*YZ&If@#!xg4E}K63;(!LvP3u*wp8S#SBbrWy3Cx~Hy!4OTcTalDeFnu z$8@db(C`I=@)#1v!mMxxIogr%D?Xe}lQ02BB{3*g5Jy78DF$U(lhZ2Lz@?H1r=ci_ zp%_$Xi;r90!&mtXVu@P21NwZ)pdNF4svU<`kqlZkjf6>1Rmh-+Q%UMN=orI5`x;zx z6R&+k61V!piW3Zq63VDSz>0f!hH$q9>85b8KOm`x`P4yz0S}>1G=tKJT00LGZfB5! zbgXsb?HLe?j+&?gu?9KajAp5$-+z}sLYSeC~Z(_lr~Y~uZO7K*9iyS^jz z)q#3w&J;7QwuwS?%aGWT^5p*wpKt(1VXw7H+=RX0z>0}S;j=4v63_V!_)VAu&96&7 zR|4NK{xLS9{zka~H>`clmoX;H;wkTTs?b6#A6^l5;s$Siu+aWY-klr5ekCErRIUYA zq2aqIcw+7sg=7iPu!=$Ng^s6SGk+A;qMmo}Q*I3=YHdA5hI1P|v?8@qyn`v6MJAj= p3mszYkWLt;lIYbaiza%8*KZQ)naq3hfGfvp;(-Ekp^p3O^&e!j5l{dC delta 382 zcmYL^Pbh`-n}g)&pz&l%Ijp4D zPRlpBX$~A5c5slt#r}rO-^i4_DS7HSKA-1#5|?Q>ObeKKjcG13=nzu1HD9s(pwHj!xJivF4{Aear9m0U^H7^ zrKW=lJ4Y5Vhr?veDOODTaGE6wnY9e*7B_h<8kSLXrc#Yxz#Y+JJJJqKl!slhFDl?T zI*pN-faO>L&SKRljf)tI4l4DM7FxF4Q9pCrHk}eBWkQ&2QhIIq|UI8 zVLl>LYgAeNPkL4ep1(9~bxV|W+sDz&eK*5HLkG$qJn%M(#3cg^M~|mSHj8xkG|JFq z6)^uIBW~r<|LVbD3y;D#7x~{-8SL*e2_H(ovyF#8#p65`#CMxW;jdcduvE{LXngwI K-SuoXmHz{$N3r+- diff --git a/.gradle/7.3.1/checksums/sha1-checksums.bin b/.gradle/7.3.1/checksums/sha1-checksums.bin index 0d1085bdcb3927bbdf0da3595adc654a4c066137..148c63184e8bdf00598db4580ef0144512c5aed2 100644 GIT binary patch delta 2257 zcmXw(dovoY^w=6@L@uN4Z zl3LwPowC2C_Yg~|vnv}jhZ5?Pu5@o&73$cZ-~0aNALscz&pglf`9AMR%T?5zQe5(N z^lVMGtW5|jeDc_A@B{w4GeAGd<9C_PEW%qw&Sc2=V8;Xo`k_?)KdA)-YQ}JSwjK`s ze)pok(i17W#_x0vW#DGZfj5DdzEb#^*Sl!VJ#?nzdG>xDRfOioO0)7E;$|l}U0OzX z_BLMaD$LqzD7k;<)o5B=%wKSe1W;{}_pJI?Ie~dQ_;2HdVO)?hy>`lK0yWEdwPyr? zM_$fq-<7})B{Yja=yjce(fW`b-d|%0%hx=e&+?&n=5&9Q`sY*t3D z8PiK(elx$^&xwH>{WtaO4{;?hCx?%nW(VNdAkC-Elju$v0et-Q01JrvXFP9N7(gnu z_WaRVy)w8n=uq;l6}1FrP2_R{1DOc{d|Z(CalrG1Ppts-2|2FIESX12vS;#z&pZK~ z+Y!dCO`uw`&3XOvZU7gIwjMZU7ECHLyZOSdP8poNBql=UdzZkRUOxV{ihC5#BKy_qAUm(1ijHv8)Kwxupbh&Bz zOu}-Fob{J-7}H)kE@4_GVOd2d^wxirGFn($*C01Wi4KeBu3o%w`jKS1pqsE1k3b!XgL=*6`u`1gWAD-PdY*PF5Q z2yN_&m?F>%l~0a&XZx-sP>Zpt2&l|qY1faDxww_kyt9}s0ZYDPCM$Ky_xRWIAaDry z7hk&!oMbRDTK9Rt;X0{2sK-V;=*p&4bk?FOij!{`1- zj8^MHX$KY7)DJon-+VgtN|Ym^d1{=}0JbUMY zQB5+sJgmAqs3T=&&_~tQy@ci{am78*CAZ!Gw(Z4<=1JuLBXe*#E_wib0OPGHS3Z&> z!66&m@f3KRKx$XU29iMUdC0ZW+a(vI4n*n9Y!;8 zsCrODv>lCYxY8mP`AKOnqLGu*{-SYl(p8eUIfq#Efi7pX6vKErwW&{ZY8nj<=gC6# zQm?t9N!UVh{l(Hz62z^7rIXDUCqIFtSJP|p zzVF;=XiMIToipPg7v7c;O>kzMk+U?aTWoz%y2E=S`?jPrTui4+ldp8AD)|+Q%GV29td^F%g%a%r_dTU}7_qxYdJ0IiF*@kz0HvC$p0XEop?Q?4`(4x2 zzQt>zTP+QY#=Lc)4?ee%9Dyah>T2`Zl$cI;HT3(RirLNmGv5228cWw-;%B4i;4B6Y zKODm$XSx0KucM(2&42G|<$tf-8J3jc9f6vUmY4iQ9Cl7|$h;Cqkb2r|QN$@SX9hi) z-w4Vt%z_qj(|XE$b~0M~^|)RgE;Oo{f=ssMoHn7D&;lhN)NSPvDwazi>F0H`cqpOE zAY2yALO52S6|AY1&%eTU?oT7g2h(u#A8C!Nyv7K}8+b&|N>q+vQFNce8I!0#kF+F~ zFC%E=oda--p#j{+>cNS8w5%9w1K5$6xN-wv{O(O8#mR_<sPD_nHMx$O7MD?-7QFsl)KZYC={&8GlV&)n8AiAF;q4|^e4zcG2x-5J$ ogP>5}Y7ri`LKfL~m@x1!YqTlmkH|8`8nYX@##klZ&%qi017#WB4gdfE diff --git a/.gradle/7.3.1/executionHistory/executionHistory.bin b/.gradle/7.3.1/executionHistory/executionHistory.bin index 14b533927e8bbd06f71cf1fbff35aa3fbaaa877e..c2a65b3cb7240067401129d9fd4560cc3b0e82a3 100644 GIT binary patch delta 32997 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 delta 25166 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 P$|%^*J>uZfYhw35l2iFw diff --git a/.gradle/7.3.1/executionHistory/executionHistory.lock b/.gradle/7.3.1/executionHistory/executionHistory.lock index 758e340480649a766ef5b74804cef364c565c23a..14c1a87ec079a3888146ab363bb1b49664f38acc 100644 GIT binary patch literal 17 UcmZR+cTOPrv-1N-1_;On06EwM=Kufz literal 17 UcmZR+cTOPrv-1N-1_+1-06E44)c^nh diff --git a/.gradle/7.3.1/fileHashes/fileHashes.bin b/.gradle/7.3.1/fileHashes/fileHashes.bin index 5b37a74fff0f329e62c2e7a82f841d937277465c..3c0ba52b394b64359ce42355aceef237a3a2bce2 100644 GIT binary patch delta 16371 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%0DY?Dq zF6Wn&kXrLwNeP=FxTJ(|Es07>9z-Q2grVebB_(XH!zCqz>v2g5;RX_wlst$^N(eXM zk`ltrxTNGkR8m5?1(%c%hLNbGgm5b^DIwfOqLLEA?YN|ba0f0aA&ewZNeSUj5|xw? zMv7ZsIjNEowh!Wx62chrw~`XJ5B*+J!gee!DIq-a zTS*C<09A&(l9Jox^`epzHji?9(Y+9l$~;t3!Yg|xE8Lk`CFd6X@l{1=NEa`El}tO*ALM>nruJVpqvd4) delta 1385 zcmYjQYfKbZ6y5{E!b(kSQs)lp@&-|4XAldTl&VR?V6;|EAF)w(ZDUGX5U|3s#@5&r zsYzuwU+`KI)0RK5Sg3%ymMUPIRI7EtZQs92No(goYf|fupJ$TcayrpYO!s`2siRyHT`2!N~|N%> z{bd44nVLBB&4tZpY6nUz&%Slzl|Y-)JUH9%-iBwl}jP2)ncW@`D!Auw#WHQ(CD)o^B-}hg!+N<&|C; zae^A;g%i{zPoJb*nSY90vgZ_4%g+K_zb`=fXnNHr#g8P~idJnPgst(*p`ZA+t~2D6 z*=PB-eP>CL=g)HHI~}AT?6n?wwUhkvco$V;ckadTl(`nm`UGkJgks^F64*HH!ql__ ztDopN_{0HqM!+?rqj9DjD}n}Ef;y&xicI#9D&O{SzX1?JSPFIE!tk_VK@M3FH1p!nps8aCU4D zXNNDG<9;?(o0X3PpR=vNYUWy5nj68k)e)Rq7s2YVDXonphxAACYT|5M>NgvQyj;Z& zS!I@=&2efJ7g!s`4o?*6Z5xcV_mk-HDV-^p>;SPsUs@3 zj2IXhaij5$hKV~~)c$o9UyeFKcU|z@?Zn1=D)!&2$LcX1?PCHXV-D!!Dz=Y1aBe&g z@e=}@CJeMPy*O#0bW)&wvImWS=c3@g3;p*M%zaRSx(D}g?V%5~k2Lf@GO*^cK;2_S zWWTa#^QB+bUwSqjQd0kW9~~d_#MUjNj$OPuxr?7q^i(y@P3f>rD{U*L zj}V5RsED57k<9d+1xavY=20~ Ua7)~x2>H=fniDt{MVYJq0Rs*=IRF3v diff --git a/.gradle/7.3.1/fileHashes/fileHashes.lock b/.gradle/7.3.1/fileHashes/fileHashes.lock index 7bf6c394f0535cdb0a58abf69e2e9e5b11f5d2b1..e344cb2f411c3809b945b6b57f4105f887d25232 100644 GIT binary patch literal 17 VcmZS1>f7;l+m4fE3}C>O2mnGf1-SqK literal 17 VcmZS1>f7;l+m4fE3}C>K3IIYh1-k$M diff --git a/.gradle/7.3.1/fileHashes/resourceHashesCache.bin b/.gradle/7.3.1/fileHashes/resourceHashesCache.bin index 126243027d9e3a80beabc637426fa71e20fd36c0..86ca224e3c419f1548404cc302fcf97d136a765e 100644 GIT binary patch delta 2866 zcmZYAdpwl+9tZG-RLDM0#cpn629w9N=wfK)maS-9+GrJtQf5n1$rv-t3`TC1zQ!e~ zliRN3GCQ2oCP$l-id@QeR*gDEsmNMXDq5Z2^X%(&&Y9P1{&~;m`~Ci&-*2Ah85yA! z9#^Sdu~=6r4mmK^cQM0x)_*=p4xh*mtX#YvmrNQTj@b25f_{ukg_yNZ;=XLP;E;ycR$-!)4dycf+olenAl>Y&REZf zxuiuyl>r+s?~5*!a~uN^@~1#)5J6P@B;7~Hw zH>@SY zbHu6$MGC6JCAA^&G)v1t&ife}=?vnMqV?GW%a(40@jL$tH}4SaJd&w_JkA|@=yEKe zZSD07Uu;4qk%Q2Pfj2g?`l=TcT|+1x1(}gA-jvZgFMXZ{xnYvK3Z;=b4SU#;l2-Gk znQX~~DF)NbCi#roKuRMr(OYW#E$QCW)${t7AWsPd9p+=a{Y6=26<@$W7&`*POgWan z-7#$S=?%#Ec_1@pV&>Tko%;rVK$h47RmKdwyWY1`_PV-_ELwEs}Y18-8XQ-b+WnHH3L+MZoLdkJxH(?WxPG-$X&+WQP zCT~!)o@nN1%!!S(M=rPsQzl|e>mS#~&)(pX4I&}NRE}Mq6+N5a)FF!-216DXJ64iQ zbhaBKi~j+HtO#OwA z7~Qf#!zFq>({nm%b$*YLiFJWPFobeTn{py5@ZAepS9sUtxdU=Kq$~sR1twR ztg>rCLf5+%gz>I0W$uUV=s2WZ5!`?*btQOM_+b_esu9~0vydh4g{&FV>_0f)c-?H$ zx}e8`iRpD)g&zOO3z=jBhAkfB+U5x(2Sv8XX7O#I#j+MRPz&H0UbwH4cK8=euy)Zg_lm@T47C&7}^(_kC%)(hwrZ z1~SSw{phr?{KO^+@?Dm!c?QRm)4$nyu~iULe}bRy`KoP$hc36U#Bc<5FC zw9H-oR%CSz46J11J5!TYmCIGOB22IbomI6M_bsoTURtpnVG>+f<%q3*QtB*Zk06S> z4a2J(%o@E%W2^#fkfrEQ%iPzx+wW&L0eKn;lVE7?fVqq3Es^QMDDgoz;_wD-lM`a4pUeYeOhO%y|my&pDPI|H{|EI>it0?=YJh{L_!Q-WfBZL<0~ zH9qFR#cwum?qMQNxDPBg13yxu#r5e8m`h?kII#<`Z;B;T>umYRlA58N?T6it(mY}G zh`e-hBIr1<3I1CJXItDka(rAkH7TA|(Wg@GPHtY(Ht=xp#RYxye65zf$5B^tFl0F} zG2A9fV_P8khEH7tWe#pCRyXC$^{NWj_0>zmKF|C7uvzf=i|?uv-@!h$X;sI0geLLR zKR+Mn|DAZ&DgM+ny6;hU&(NBC3xEIohWwwzsjwQ|DyQlfg=)%0p8L&AAvB^7mxSbc zt2&1~mG0P5VRqrnAoy^3c<#f_?2i_K9!e}nBh%zVW66Ck4Zk@?OCIsGDRocKEyxWB zE`+Y_ixls_zo?4uxlZHy>q(#JIsH0&kJm9zMe}}R8h*U$gSX0q!jPNvyfl7gzl&ll zYFfpv+Wl0*Q1H|6FKyR8*pZYs@c+xKE_M@nZK<5lKH2E)bC;_E%^MdfRvj`@!T-=L rnH_XQdyv>)(M)HAjY4?L75sGUHTGLCaf6Dh;{>hNv|M3(gireu%at6{ delta 407 zcmWO2F-#Lt0LJkgiN>XD_1;N2dPuJo?A@!aO$lv+K zjk$M(bBaXDqMqu~JX5|96q ztRFG1@3Ofj3D+XF)(f1jORlwc!{@M}m^Pl$X_|yheNFR-Hyeuc4WE2VaoDmLx2iMF O*U!%L*|?!T`u_nhCY@^l diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6fb5da0a812f389ed651feb271f7836f60135c05..baa9c000eb2fc391a8682b570945392f211094dd 100644 GIT binary patch literal 17 UcmZS96&G??bfac20|d+k03?G0$^ZZW literal 17 UcmZS96&G??bfac20|Zn703=`orvLx| diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 844aaec7c52299703272300532c5220fa2b08fb2..b3ff574d90814501ff98e3cb086a38230f4baebf 100644 GIT binary patch delta 581 zcmex5i*frr#tkMCjLDNtB`P%fVwQhgYQ^$~0Sx@a|3g7vPtVjE4cQ4$ao@>HB{m2w zTXf}8$!h0psNmGezLE+8D?2Mby$o)*g$foZ(+AcDRRC(o725O`iwZ&h+QR{^TBdGcSW0D<@2Vyv}~ zKVF0g`ZG>;l~&OB@-17~_xKbKsLInYyM8=lJkDo*mKiGkesZj|g~0!n7xo!1oPP{z zg6ia6=>`GLHJ3uKI!rT#s{8c6+!g|dC)n7N>Km*YCJj_)#`Nq31mwcCpDE3RiPm7P=OJ>i9_zdJcp)=ff|`?CWdj5vPkxy`i9LBH z)P(lQXJr-n+gtYi+oC@mDzo&oim0kAX}0ZNlK7t^V literal 8 PcmZQzU~IG!TI&G-1ycdU diff --git a/.gradle/loom-cache/launch.cfg b/.gradle/loom-cache/launch.cfg index d80025f..2051659 100644 --- a/.gradle/loom-cache/launch.cfg +++ b/.gradle/loom-cache/launch.cfg @@ -1,14 +1,14 @@ commonProperties fabric.development=true - fabric.remapClasspathFile=C:\Users\yena\Documents\GitHub\Aspects\.gradle\loom-cache\remapClasspath.txt - log4j.configurationFile=C:\Users\yena\Documents\GitHub\Aspects\.gradle\loom-cache\log4j.xml + fabric.remapClasspathFile=C:\Users\inscr\Documents\GitHub\Aspects\.gradle\loom-cache\remapClasspath.txt + log4j.configurationFile=C:\Users\inscr\Documents\GitHub\Aspects\.gradle\loom-cache\log4j.xml log4j2.formatMsgNoLookups=true fabric.log.disableAnsi=false clientArgs --assetIndex 1.18.2-1.18 --assetsDir - C:\Users\yena\.gradle\caches\fabric-loom\assets + C:\Users\inscr\.gradle\caches\fabric-loom\assets clientProperties - java.library.path=C:\Users\yena\.gradle\caches\fabric-loom\1.18.2\natives - org.lwjgl.librarypath=C:\Users\yena\.gradle\caches\fabric-loom\1.18.2\natives \ No newline at end of file + java.library.path=C:\Users\inscr\.gradle\caches\fabric-loom\1.18.2\natives + org.lwjgl.librarypath=C:\Users\inscr\.gradle\caches\fabric-loom\1.18.2\natives \ No newline at end of file diff --git a/.gradle/loom-cache/remapClasspath.txt b/.gradle/loom-cache/remapClasspath.txt index ccc2c25..cfe3ff4 100644 --- a/.gradle/loom-cache/remapClasspath.txt +++ b/.gradle/loom-cache/remapClasspath.txt @@ -1 +1 @@ -C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-mappings-parser\0.3.0+build.17\2f10540a290e382a7cd35c16ec3900046a4e252\tiny-mappings-parser-0.3.0+build.17.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc\sponge-mixin\0.11.4+mixin.0.8.5\c1dc27696aa4006e492c2485c9ccbcb26045a971\sponge-mixin-0.11.4+mixin.0.8.5.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-remapper\0.8.2\2cc6565989469ec38893bfb7802b31c0d0d11ea0\tiny-remapper-0.8.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc\access-widener\2.1.0\f62a27adbfd8ab4d4fa5681793039f2c0b177155\access-widener-2.1.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm\9.3\8e6300ef51c1d801a7ed62d07cd221aca3a90640\asm-9.3.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-analysis\9.3\4b071f211b37c38e0e9f5998550197c8593f6ad8\asm-analysis-9.3.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-commons\9.3\1f2a432d1212f5c352ae607d7b61dcae20c20af5\asm-commons-9.3.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-tree\9.3\78d2ecd61318b5a58cd04fb237636c0e86b77d97\asm-tree-9.3.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-util\9.3\9595bc05510d0bd4b610188b77333fe4851a1975\asm-util-9.3.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\logging\1.0.0\f6ca3b2eee0b80b384e8ed93d368faecb82dfb9b\logging-1.0.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\blocklist\1.0.10\5c685c5ffa94c4cd39496c7184c1d122e515ecef\blocklist-1.0.10.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\patchy\2.2.10\da05971b07cbb379d002cf7eaec6a2048211fefc\patchy-2.2.10.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.github.oshi\oshi-core\5.8.5\1d0ec654d820741327f5a9229d513732a4b7ce50\oshi-core-5.8.5.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna\5.10.0\7cf4c87dd802db50721db66947aa237d7ad09418\jna-5.10.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna-platform\5.10.0\fbed7d9669dba47714ad0d4f4454290a997aee69\jna-platform-5.10.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.slf4j\slf4j-api\1.8.0-beta4\83b0359d847ee053d745be7ec0d8e9e8a44304b4\slf4j-api-1.8.0-beta4.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-slf4j18-impl\2.17.0\bd7f6c0b9224dd214afb4e684957e2349b529a8d\log4j-slf4j18-impl-2.17.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.ibm.icu\icu4j\70.1\dfa3a1fbc55bf5db8c6e79fc0935ac7ab1202950\icu4j-70.1.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\javabridge\1.2.24\c876796229b2ef5120f186eab5acc870699d3b9\javabridge-1.2.24.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.sf.jopt-simple\jopt-simple\5.0.4\4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c\jopt-simple-5.0.4.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\io.netty\netty-all\4.1.68.Final\b8266a3c93c1c051109f71d3449e5dcd5d60b333\netty-all-4.1.68.Final.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.google.guava\failureaccess\1.0.1\1dcf1de382a0bf95a3d8b0849546c88bac1292c9\failureaccess-1.0.1.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.google.guava\guava\31.0.1-jre\119ea2b2bc205b138974d351777b20f02b92704b\guava-31.0.1-jre.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-lang3\3.12.0\c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e\commons-lang3-3.12.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.11.0\a2503f302b11ebde7ebc3df41daebe0e4eea3689\commons-io-2.11.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\commons-codec\commons-codec\1.15\49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d\commons-codec-1.15.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\brigadier\1.0.18\c1ef1234282716483c92183f49bef47b1a89bfa9\brigadier-1.0.18.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\datafixerupper\4.1.27\a02c43824ce57c3f7a7d7e744f0d99a040398b5\datafixerupper-4.1.27.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.google.code.gson\gson\2.8.9\8a432c1d6825781e21a02db2e2c33c5fde2833b9\gson-2.8.9.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\authlib\3.3.39\289405e70c0917eaeac017f7fba9adb4427baa36\authlib-3.3.39.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-compress\1.21\4ec95b60d4e86b5c95a0e919cb172a0af98011ef\commons-compress-1.21.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpclient\4.5.13\e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada\httpclient-4.5.13.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\commons-logging\commons-logging\1.2\4bfc12adfe4842bf07b657f0369c4cb522955686\commons-logging-1.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpcore\4.4.14\9dd1a631c082d92ecd4bd8fd4cf55026c720a8c1\httpcore-4.4.14.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\it.unimi.dsi\fastutil\8.5.6\76f95700418a68fbc4ac050525261f05dc681ca1\fastutil-8.5.6.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-api\2.17.0\bbd791e9c8c9421e45337c4fe0a10851c086e36c\log4j-api-2.17.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-core\2.17.0\fe6e7a32c1228884b9691a744f953a55d0dd8ead\log4j-core-2.17.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl\3.2.2\8ad6294407e15780b43e84929c40e4c5e997972e\lwjgl-3.2.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-jemalloc\3.2.2\ee8e57a79300f78294576d87c4a587f8c99402e2\lwjgl-jemalloc-3.2.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-openal\3.2.2\2b772a102b0a11ee5f2109a5b136f4dc7c630827\lwjgl-openal-3.2.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-opengl\3.2.2\6ac5bb88b44c43ea195a570aab059f63da004cd8\lwjgl-opengl-3.2.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-glfw\3.2.2\d3ad4df38e400b8afba1de63f84338809399df5b\lwjgl-glfw-3.2.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-stb\3.2.2\3b8e6ebc5851dd3d17e37e5cadce2eff2a429f0f\lwjgl-stb-3.2.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-tinyfd\3.2.2\fcbe606c8f8da6f8f9a05e2c540eb1ee8632b0e9\lwjgl-tinyfd-3.2.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.mojang\text2speech\1.12.4\1f618f522dbdd93218c270bcfd8f8dd84be31717\text2speech-1.12.4.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\ca.weblite\java-objc-bridge\1.0.0\6ef160c3133a78de015830860197602ca1c855d3\java-objc-bridge-1.0.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.github.apace100\origins-fabric\v1.4.1\ca3f7ff601fe16edf2a259daf435b23771701fcd\origins-fabric-v1.4.1.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.github.apace100\apoli\v2.3.3\94e02da411f4de9d906629c0c41dba70e124ca79\apoli-v2.3.3.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\me.shedaniel.cloth\cloth-config-fabric\6.2.57\c52ef239d9d3d3473312d3f57bd8e730155ee5a5\cloth-config-fabric-6.2.57.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\dev.onyxstudios.cardinal-components-api\cardinal-components-entity\4.1.4\c26db441ac9c0848ea34dc7829fa16eead2b5fab\cardinal-components-entity-4.1.4.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\dev.onyxstudios.cardinal-components-api\cardinal-components-base\4.1.4\f3b6f7ddbd056176cb580a0aa3c71c3d9afdb335\cardinal-components-base-4.1.4.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.terraformersmc\modmenu\3.1.0\b520422af2fce2d7cd02b6b9ae4f025822670c28\modmenu-3.1.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.jamieswhiteshirt\reach-entity-attributes\2.1.1\482e10f937c39d5ede0c753603edf9c5c69b6a33\reach-entity-attributes-2.1.1.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\io.github.ladysnake\PlayerAbilityLib\1.5.0\3b2784ea7ca89b52f31b91166ebaac944e449534\PlayerAbilityLib-1.5.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.github.apace100\calio\v1.5.1\9aad74e0a0a8eae69b7541a76827c7f6340879e5\calio-v1.5.1.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.github.DaFuqs\AdditionalEntityAttributes\1.18.2-SNAPSHOT\4836f649ee2d43a075a59f46288bdb8bdc13a97f\AdditionalEntityAttributes-1.18.2-SNAPSHOT.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc\fabric-loader\0.14.6\f89d2429364fe160e139bcfaab640ffbbcf03242\fabric-loader-0.14.6.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api\0.54.0+1.18.2\3fff30b4a4aedc1aac86bfbdde1c8817e71a3adc\fabric-api-0.54.0+1.18.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\blue.endless\jankson\1.2.0\3a596049034f2952c0b2d40ca41f9b98856d5fb4\jankson-1.2.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.moandjiezana.toml\toml4j\0.7.2\a03337911d0bd2c40932aca3946edb30d0e7d0c\toml4j-0.7.2.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.yaml\snakeyaml\1.27\359d62567480b07a679dc643f82fc926b100eed5\snakeyaml-1.27.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\com.google.code.gson\gson\2.8.1\2a8e0aa38a2e21cb39e2f5a7d6704cbdc941da0\gson-2.8.1.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\org.jetbrains\annotations\19.0.0\efbff6752f67a7c9de3e4251c086a88e23591dfd\annotations-19.0.0.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-transfer-api-v1\1.6.2+f4563ac860\6db8f108c0250a9b7fd9876cd3245d40d9084999\fabric-transfer-api-v1-1.6.2+f4563ac860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api-lookup-api-v1\1.6.1+2373a54560\724d3cae70657f7353241c0a667c7eb59572311f\fabric-api-lookup-api-v1-1.6.1+2373a54560.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-blockrenderlayer-v1\1.1.12+3ac43d9560\137ef8f5f1e50077c4868ccad1db5c97078d1ac\fabric-blockrenderlayer-v1-1.1.12+3ac43d9560.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-commands-v0\0.2.8+b4f4f6cd60\99d3495a506ede808a352afdd730c1f4625c8d14\fabric-commands-v0-0.2.8+b4f4f6cd60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-command-api-v1\1.1.9+d7c144a860\caae0133ffd0b83484aaad5017931e5c175239af\fabric-command-api-v1-1.1.9+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-containers-v0\0.1.21+d7c144a860\ca1bd3d9f62c40801fbee5fe88c61ff0d1279bee\fabric-containers-v0-0.1.21+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-content-registries-v0\3.0.6+d82b939260\c99e217fc05df4ba254eee9d854a52b7c363df43\fabric-content-registries-v0-3.0.6+d82b939260.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-convention-tags-v1\1.0.1+474e4f7960\b25773d644105a987fc62b3a4a1ce0b2baf6d4d7\fabric-convention-tags-v1-1.0.1+474e4f7960.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-data-generation-api-v1\2.0.9+e19de87d60\1dcba68a766c1d95063551a25ea8bcd7916f1dcd\fabric-data-generation-api-v1-2.0.9+e19de87d60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-dimensions-v1\2.1.19+ffb2c71e60\35a484dff928414016149c2f1b81556c7abdeafe\fabric-dimensions-v1-2.1.19+ffb2c71e60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-entity-events-v1\1.4.8+d7c144a860\83e765f6da53bbeae379edf4e85676cd953447d5\fabric-entity-events-v1-1.4.8+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-events-interaction-v0\0.4.19+d7c144a860\6a2141444d505fda4831aceb43d90f0e7985c02\fabric-events-interaction-v0-0.4.19+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-events-lifecycle-v0\0.2.16+d7c144a860\5b4562b20204ee201299ccece6018b75b443a45c\fabric-events-lifecycle-v0-0.2.16+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-gametest-api-v1\1.0.18+91b7aa6660\39e627134aa3f060c00050a54faff5ce7b2ae444\fabric-gametest-api-v1-1.0.18+91b7aa6660.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-item-api-v1\1.5.0+85719ab760\67c7a362cd50e5a9f7c5d6ef9811298608cf918e\fabric-item-api-v1-1.5.0+85719ab760.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-item-groups-v0\0.3.13+91896a4960\439937e6123717983627b8f0c527d03a08048338\fabric-item-groups-v0-0.3.13+91896a4960.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-lifecycle-events-v1\2.0.4+d8d7804a60\dea7cc4932f4607acd84f29bb96081ce467e5d37\fabric-lifecycle-events-v1-2.0.4+d8d7804a60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-loot-tables-v1\1.1.0+e747827960\131c5fcfd11954b64aae021479c2ad3dc373e709\fabric-loot-tables-v1-1.1.0+e747827960.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-loot-api-v2\1.0.0+e747827960\b31158691f30d0ef2f13483ee817344f715cebf2\fabric-loot-api-v2-1.0.0+e747827960.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-mining-level-api-v1\2.1.2+81ea5b3c60\5a45018a37318ff08a75e98ffcd100279d74187c\fabric-mining-level-api-v1-2.1.2+81ea5b3c60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-models-v0\0.3.6+d7c144a860\71e8ccd08b560ba414f904215cf808e1c2546301\fabric-models-v0-0.3.6+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-networking-v0\0.3.8+b4f4f6cd60\968440f6db1ed03ea2c516d2e21d560d95f47a31\fabric-networking-v0-0.3.8+b4f4f6cd60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-registry-sync-v0\0.9.8+0d9ab37260\440b6b84e74e2cf72e83b9c51c50d1bdf19b9416\fabric-registry-sync-v0-0.9.8+0d9ab37260.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-screen-handler-api-v1\1.2.0+1f6558e860\2111d0d1068f289514ce56d0262fd32fb808b1a7\fabric-screen-handler-api-v1-1.2.0+1f6558e860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-networking-api-v1\1.0.21+d882b91560\96c5b9af54d89eab76fc7dd4440bf77248d4a117\fabric-networking-api-v1-1.0.21+d882b91560.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-object-builder-api-v1\2.1.2+032c981d60\498fa4157bab844160667f595ee415f833981f2a\fabric-object-builder-api-v1-2.1.2+032c981d60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-particles-v1\0.2.12+526dc1ac60\7ddcf827c21eeba7b7bb9f6017272573dec4b964\fabric-particles-v1-0.2.12+526dc1ac60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-indigo\0.5.0+7faf0d8860\6fe77fc29644c88bcd3cbc19ed9f7e6aa7402daf\fabric-renderer-indigo-0.5.0+7faf0d8860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-api-v1\0.4.13+d882b91560\35ee2a353c18f16d3e06ba7c294de99ac60b7c0f\fabric-renderer-api-v1-0.4.13+d882b91560.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-registries-v1\3.2.11+b4f4f6cd60\37b91ba8c279555774dbf8c0e845f5cd64238084\fabric-renderer-registries-v1-3.2.11+b4f4f6cd60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-data-attachment-v1\0.3.7+d7c144a860\b423925fb7bb6e1f0659333f299df2b31d54b681\fabric-rendering-data-attachment-v1-0.3.7+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-fluids-v1\2.0.2+54e5b2ec60\59f95c6b51e1336666115692c05984ac29e4ba91\fabric-rendering-fluids-v1-2.0.2+54e5b2ec60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-v0\1.1.13+b4f4f6cd60\5bb77f50917c5d8832078c608945a946072481f3\fabric-rendering-v0-1.1.13+b4f4f6cd60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-v1\1.10.7+54e5b2ec60\b2f708b6cfa5c75b7c251f2ba404b2d50418a7dc\fabric-rendering-v1-1.10.7+54e5b2ec60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-screen-api-v1\1.0.10+d882b91560\da5e087252518c98e9dadaad8a2f04bae40adff6\fabric-screen-api-v1-1.0.10+d882b91560.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-textures-v0\1.0.12+3ac43d9560\985f592c645035f8b49ad052763e28f5ebca8268\fabric-textures-v0-1.0.12+3ac43d9560.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api-base\0.4.4+d7c144a860\ec07c98df3d4c4c5a3a5ea5ef3a82136666ead36\fabric-api-base-0.4.4+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-biome-api-v1\8.0.4+7b0f312660\8750797b82b4a37c9defcbddf5cf6d2f9a99380\fabric-biome-api-v1-8.0.4+7b0f312660.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-crash-report-info-v1\0.2.1+ee261a3e60\29b397a2e113fb7b4ecd432eace3b85690829d68\fabric-crash-report-info-v1-0.2.1+ee261a3e60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-game-rule-api-v1\1.0.13+d7c144a860\29d449bd3e4c7398ab570583c38874b49a704902\fabric-game-rule-api-v1-1.0.13+d7c144a860.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-keybindings-v0\0.2.10+b4f4f6cd60\1274d7b5ea0951d346485b65d83004e31a7a9ab1\fabric-keybindings-v0-0.2.10+b4f4f6cd60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-key-binding-api-v1\1.0.12+54e5b2ec60\5da617bdc099d76257d5d8d0e1a86864681fdba2\fabric-key-binding-api-v1-1.0.12+54e5b2ec60.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-resource-conditions-api-v1\2.0.3+91b7aa6660\2a09808ba669446c956cbd56ba1c293af877d28d\fabric-resource-conditions-api-v1-2.0.3+91b7aa6660.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-resource-loader-v0\0.5.1+e747827960\9b6159811a0f0f87fa050977c29619ed7c813555\fabric-resource-loader-v0-0.5.1+e747827960.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-transitive-access-wideners-v1\1.1.0+e747827960\117da5c75031557fae71637eda011368130f15fe\fabric-transitive-access-wideners-v1-1.1.0+e747827960.jar;C:\Users\yena\.gradle\caches\modules-2\files-2.1\me.shedaniel.cloth\basic-math\0.6.0\1218655af0c83dd7678eaef234da0ddade95da0a\basic-math-0.6.0.jar;C:\Users\yena\.gradle\caches\fabric-loom\1.18.2\net.fabricmc.yarn.1_18_2.1.18.2+build.3-v2\minecraft-intermediary.jar \ No newline at end of file +C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-mappings-parser\0.3.0+build.17\2f10540a290e382a7cd35c16ec3900046a4e252\tiny-mappings-parser-0.3.0+build.17.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\sponge-mixin\0.11.4+mixin.0.8.5\c1dc27696aa4006e492c2485c9ccbcb26045a971\sponge-mixin-0.11.4+mixin.0.8.5.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-remapper\0.8.2\2cc6565989469ec38893bfb7802b31c0d0d11ea0\tiny-remapper-0.8.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\access-widener\2.1.0\f62a27adbfd8ab4d4fa5681793039f2c0b177155\access-widener-2.1.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm\9.3\8e6300ef51c1d801a7ed62d07cd221aca3a90640\asm-9.3.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-analysis\9.3\4b071f211b37c38e0e9f5998550197c8593f6ad8\asm-analysis-9.3.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-commons\9.3\1f2a432d1212f5c352ae607d7b61dcae20c20af5\asm-commons-9.3.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-tree\9.3\78d2ecd61318b5a58cd04fb237636c0e86b77d97\asm-tree-9.3.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.ow2.asm\asm-util\9.3\9595bc05510d0bd4b610188b77333fe4851a1975\asm-util-9.3.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\logging\1.0.0\f6ca3b2eee0b80b384e8ed93d368faecb82dfb9b\logging-1.0.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\blocklist\1.0.10\5c685c5ffa94c4cd39496c7184c1d122e515ecef\blocklist-1.0.10.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\patchy\2.2.10\da05971b07cbb379d002cf7eaec6a2048211fefc\patchy-2.2.10.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.github.oshi\oshi-core\5.8.5\1d0ec654d820741327f5a9229d513732a4b7ce50\oshi-core-5.8.5.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna\5.10.0\7cf4c87dd802db50721db66947aa237d7ad09418\jna-5.10.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.java.dev.jna\jna-platform\5.10.0\fbed7d9669dba47714ad0d4f4454290a997aee69\jna-platform-5.10.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.slf4j\slf4j-api\1.8.0-beta4\83b0359d847ee053d745be7ec0d8e9e8a44304b4\slf4j-api-1.8.0-beta4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-slf4j18-impl\2.17.0\bd7f6c0b9224dd214afb4e684957e2349b529a8d\log4j-slf4j18-impl-2.17.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.ibm.icu\icu4j\70.1\dfa3a1fbc55bf5db8c6e79fc0935ac7ab1202950\icu4j-70.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\javabridge\1.2.24\c876796229b2ef5120f186eab5acc870699d3b9\javabridge-1.2.24.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.sf.jopt-simple\jopt-simple\5.0.4\4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c\jopt-simple-5.0.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.netty\netty-all\4.1.68.Final\b8266a3c93c1c051109f71d3449e5dcd5d60b333\netty-all-4.1.68.Final.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.google.guava\failureaccess\1.0.1\1dcf1de382a0bf95a3d8b0849546c88bac1292c9\failureaccess-1.0.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.google.guava\guava\31.0.1-jre\119ea2b2bc205b138974d351777b20f02b92704b\guava-31.0.1-jre.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-lang3\3.12.0\c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e\commons-lang3-3.12.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.11.0\a2503f302b11ebde7ebc3df41daebe0e4eea3689\commons-io-2.11.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\commons-codec\commons-codec\1.15\49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d\commons-codec-1.15.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\brigadier\1.0.18\c1ef1234282716483c92183f49bef47b1a89bfa9\brigadier-1.0.18.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\datafixerupper\4.1.27\a02c43824ce57c3f7a7d7e744f0d99a040398b5\datafixerupper-4.1.27.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.google.code.gson\gson\2.8.9\8a432c1d6825781e21a02db2e2c33c5fde2833b9\gson-2.8.9.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\authlib\3.3.39\289405e70c0917eaeac017f7fba9adb4427baa36\authlib-3.3.39.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-compress\1.21\4ec95b60d4e86b5c95a0e919cb172a0af98011ef\commons-compress-1.21.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpclient\4.5.13\e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada\httpclient-4.5.13.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\commons-logging\commons-logging\1.2\4bfc12adfe4842bf07b657f0369c4cb522955686\commons-logging-1.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.httpcomponents\httpcore\4.4.14\9dd1a631c082d92ecd4bd8fd4cf55026c720a8c1\httpcore-4.4.14.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\it.unimi.dsi\fastutil\8.5.6\76f95700418a68fbc4ac050525261f05dc681ca1\fastutil-8.5.6.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-api\2.17.0\bbd791e9c8c9421e45337c4fe0a10851c086e36c\log4j-api-2.17.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.apache.logging.log4j\log4j-core\2.17.0\fe6e7a32c1228884b9691a744f953a55d0dd8ead\log4j-core-2.17.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl\3.2.2\8ad6294407e15780b43e84929c40e4c5e997972e\lwjgl-3.2.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-jemalloc\3.2.2\ee8e57a79300f78294576d87c4a587f8c99402e2\lwjgl-jemalloc-3.2.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-openal\3.2.2\2b772a102b0a11ee5f2109a5b136f4dc7c630827\lwjgl-openal-3.2.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-opengl\3.2.2\6ac5bb88b44c43ea195a570aab059f63da004cd8\lwjgl-opengl-3.2.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-glfw\3.2.2\d3ad4df38e400b8afba1de63f84338809399df5b\lwjgl-glfw-3.2.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-stb\3.2.2\3b8e6ebc5851dd3d17e37e5cadce2eff2a429f0f\lwjgl-stb-3.2.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.lwjgl\lwjgl-tinyfd\3.2.2\fcbe606c8f8da6f8f9a05e2c540eb1ee8632b0e9\lwjgl-tinyfd-3.2.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.mojang\text2speech\1.12.4\1f618f522dbdd93218c270bcfd8f8dd84be31717\text2speech-1.12.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\ca.weblite\java-objc-bridge\1.0.0\6ef160c3133a78de015830860197602ca1c855d3\java-objc-bridge-1.0.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.github.apace100\origins-fabric\v1.4.1\ca3f7ff601fe16edf2a259daf435b23771701fcd\origins-fabric-v1.4.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.github.apace100\apoli\v2.3.3\94e02da411f4de9d906629c0c41dba70e124ca79\apoli-v2.3.3.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\me.shedaniel.cloth\cloth-config-fabric\6.2.57\c52ef239d9d3d3473312d3f57bd8e730155ee5a5\cloth-config-fabric-6.2.57.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\dev.onyxstudios.cardinal-components-api\cardinal-components-entity\4.1.4\c26db441ac9c0848ea34dc7829fa16eead2b5fab\cardinal-components-entity-4.1.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\dev.onyxstudios.cardinal-components-api\cardinal-components-base\4.1.4\f3b6f7ddbd056176cb580a0aa3c71c3d9afdb335\cardinal-components-base-4.1.4.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.terraformersmc\modmenu\3.1.0\b520422af2fce2d7cd02b6b9ae4f025822670c28\modmenu-3.1.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.jamieswhiteshirt\reach-entity-attributes\2.1.1\482e10f937c39d5ede0c753603edf9c5c69b6a33\reach-entity-attributes-2.1.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\io.github.ladysnake\PlayerAbilityLib\1.5.0\3b2784ea7ca89b52f31b91166ebaac944e449534\PlayerAbilityLib-1.5.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.github.apace100\calio\v1.5.1\9aad74e0a0a8eae69b7541a76827c7f6340879e5\calio-v1.5.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.github.DaFuqs\AdditionalEntityAttributes\1.18.2-SNAPSHOT\4836f649ee2d43a075a59f46288bdb8bdc13a97f\AdditionalEntityAttributes-1.18.2-SNAPSHOT.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc\fabric-loader\0.14.6\f89d2429364fe160e139bcfaab640ffbbcf03242\fabric-loader-0.14.6.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api\0.54.0+1.18.2\3fff30b4a4aedc1aac86bfbdde1c8817e71a3adc\fabric-api-0.54.0+1.18.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\blue.endless\jankson\1.2.0\3a596049034f2952c0b2d40ca41f9b98856d5fb4\jankson-1.2.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.moandjiezana.toml\toml4j\0.7.2\a03337911d0bd2c40932aca3946edb30d0e7d0c\toml4j-0.7.2.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.yaml\snakeyaml\1.27\359d62567480b07a679dc643f82fc926b100eed5\snakeyaml-1.27.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\com.google.code.gson\gson\2.8.1\2a8e0aa38a2e21cb39e2f5a7d6704cbdc941da0\gson-2.8.1.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\org.jetbrains\annotations\19.0.0\efbff6752f67a7c9de3e4251c086a88e23591dfd\annotations-19.0.0.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-transfer-api-v1\1.6.2+f4563ac860\6db8f108c0250a9b7fd9876cd3245d40d9084999\fabric-transfer-api-v1-1.6.2+f4563ac860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api-lookup-api-v1\1.6.1+2373a54560\724d3cae70657f7353241c0a667c7eb59572311f\fabric-api-lookup-api-v1-1.6.1+2373a54560.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-blockrenderlayer-v1\1.1.12+3ac43d9560\10f117a9137d2269da0b04ecf42d61cac0c86f66\fabric-blockrenderlayer-v1-1.1.12+3ac43d9560.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-commands-v0\0.2.8+b4f4f6cd60\e3d63cd58b15c8af9a43505da2da20560c30cc23\fabric-commands-v0-0.2.8+b4f4f6cd60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-command-api-v1\1.1.9+d7c144a860\a1d535b6e1269d076bb70a1b3d743655ba29bb68\fabric-command-api-v1-1.1.9+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-containers-v0\0.1.21+d7c144a860\ca1bd3d9f62c40801fbee5fe88c61ff0d1279bee\fabric-containers-v0-0.1.21+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-content-registries-v0\3.0.6+d82b939260\c99e217fc05df4ba254eee9d854a52b7c363df43\fabric-content-registries-v0-3.0.6+d82b939260.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-convention-tags-v1\1.0.1+474e4f7960\f8e2713a72f8a6555ab9bb884bef17e15b48a051\fabric-convention-tags-v1-1.0.1+474e4f7960.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-data-generation-api-v1\2.0.9+e19de87d60\1dcba68a766c1d95063551a25ea8bcd7916f1dcd\fabric-data-generation-api-v1-2.0.9+e19de87d60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-dimensions-v1\2.1.19+ffb2c71e60\ddd230a2d646db22d9031d87350189c059de836b\fabric-dimensions-v1-2.1.19+ffb2c71e60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-entity-events-v1\1.4.8+d7c144a860\8c33c03c86c803fcb3b490e9ffdbfed140a2eecd\fabric-entity-events-v1-1.4.8+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-events-interaction-v0\0.4.19+d7c144a860\ae2e30a9c9def90c5c0b8f6ff0ed7e099a7306c6\fabric-events-interaction-v0-0.4.19+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-events-lifecycle-v0\0.2.16+d7c144a860\5b4562b20204ee201299ccece6018b75b443a45c\fabric-events-lifecycle-v0-0.2.16+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-gametest-api-v1\1.0.18+91b7aa6660\a7a1837532c003bbdd3e9e5e69a52307d067a8cf\fabric-gametest-api-v1-1.0.18+91b7aa6660.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-item-api-v1\1.5.0+85719ab760\67c7a362cd50e5a9f7c5d6ef9811298608cf918e\fabric-item-api-v1-1.5.0+85719ab760.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-item-groups-v0\0.3.13+91896a4960\71bcc0ee39fc389276bfee8cb91ae875434fb086\fabric-item-groups-v0-0.3.13+91896a4960.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-lifecycle-events-v1\2.0.4+d8d7804a60\dea7cc4932f4607acd84f29bb96081ce467e5d37\fabric-lifecycle-events-v1-2.0.4+d8d7804a60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-loot-tables-v1\1.1.0+e747827960\5d0a84b55f675d0dd318d7e239ec46fc302df600\fabric-loot-tables-v1-1.1.0+e747827960.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-loot-api-v2\1.0.0+e747827960\8e27ccac1d55bd382373553d5ac06c04816e82f2\fabric-loot-api-v2-1.0.0+e747827960.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-mining-level-api-v1\2.1.2+81ea5b3c60\5a45018a37318ff08a75e98ffcd100279d74187c\fabric-mining-level-api-v1-2.1.2+81ea5b3c60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-models-v0\0.3.6+d7c144a860\5eab97970856d29091e51347d24c9733916142a9\fabric-models-v0-0.3.6+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-networking-v0\0.3.8+b4f4f6cd60\968440f6db1ed03ea2c516d2e21d560d95f47a31\fabric-networking-v0-0.3.8+b4f4f6cd60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-registry-sync-v0\0.9.8+0d9ab37260\440b6b84e74e2cf72e83b9c51c50d1bdf19b9416\fabric-registry-sync-v0-0.9.8+0d9ab37260.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-screen-handler-api-v1\1.2.0+1f6558e860\2111d0d1068f289514ce56d0262fd32fb808b1a7\fabric-screen-handler-api-v1-1.2.0+1f6558e860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-networking-api-v1\1.0.21+d882b91560\96c5b9af54d89eab76fc7dd4440bf77248d4a117\fabric-networking-api-v1-1.0.21+d882b91560.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-object-builder-api-v1\2.1.2+032c981d60\a2d7ae1fb92c05edd75565462ab98ec6a2e9d67a\fabric-object-builder-api-v1-2.1.2+032c981d60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-particles-v1\0.2.12+526dc1ac60\e54a0e9337a7f06806a8784706e1be70514028b3\fabric-particles-v1-0.2.12+526dc1ac60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-indigo\0.5.0+7faf0d8860\5dd126c6db97586549f9435e012d9c18c865bd86\fabric-renderer-indigo-0.5.0+7faf0d8860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-api-v1\0.4.13+d882b91560\cb5271356915f82fe4c51c24a3c99b16addc13ff\fabric-renderer-api-v1-0.4.13+d882b91560.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-renderer-registries-v1\3.2.11+b4f4f6cd60\41bdba607b7d7694c367bfc5b6887dd68fd4b585\fabric-renderer-registries-v1-3.2.11+b4f4f6cd60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-data-attachment-v1\0.3.7+d7c144a860\8247095623675fc3ef7e4a98df091a3bcce6723d\fabric-rendering-data-attachment-v1-0.3.7+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-fluids-v1\2.0.2+54e5b2ec60\cc422f52ad7d8e2dfa75809fe1e7e5e9b40a5ff9\fabric-rendering-fluids-v1-2.0.2+54e5b2ec60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-v0\1.1.13+b4f4f6cd60\1e68578bc737c58f4483bf4432c5ba7fdca34839\fabric-rendering-v0-1.1.13+b4f4f6cd60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-rendering-v1\1.10.7+54e5b2ec60\790739717f6363b4df12819761433ec880874669\fabric-rendering-v1-1.10.7+54e5b2ec60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-screen-api-v1\1.0.10+d882b91560\9fe55716b007ff9c63995ebb9a556d62da643e1b\fabric-screen-api-v1-1.0.10+d882b91560.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-textures-v0\1.0.12+3ac43d9560\e6123743b2ef470c4d0c6133409a8bc5164bcc94\fabric-textures-v0-1.0.12+3ac43d9560.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-api-base\0.4.4+d7c144a860\71b8e1bdfd8362d7fcc8e1a18d48fd5491e1424\fabric-api-base-0.4.4+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-biome-api-v1\8.0.4+7b0f312660\76810d8076700ac5f4faf3dbcc792b7b0f1a42c4\fabric-biome-api-v1-8.0.4+7b0f312660.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-crash-report-info-v1\0.2.1+ee261a3e60\9f170b68009ae2791e2d79571c896e60c7b1cdc5\fabric-crash-report-info-v1-0.2.1+ee261a3e60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-game-rule-api-v1\1.0.13+d7c144a860\e1138fa6012c831866ba2dd1201d9416da15e8b7\fabric-game-rule-api-v1-1.0.13+d7c144a860.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-keybindings-v0\0.2.10+b4f4f6cd60\736f4917d5e55b6a313a24c7e7811d891955fda4\fabric-keybindings-v0-0.2.10+b4f4f6cd60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-key-binding-api-v1\1.0.12+54e5b2ec60\9fb16b2066a02ad8ee43c3ac5fe62dfb645d8241\fabric-key-binding-api-v1-1.0.12+54e5b2ec60.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-resource-conditions-api-v1\2.0.3+91b7aa6660\d67bf7a1d8c9397e6347083a43da39a7de3f96aa\fabric-resource-conditions-api-v1-2.0.3+91b7aa6660.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-resource-loader-v0\0.5.1+e747827960\5a4b25d849e30b3d6f66d951a7d73f6289a51e21\fabric-resource-loader-v0-0.5.1+e747827960.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\net.fabricmc.fabric-api\fabric-transitive-access-wideners-v1\1.1.0+e747827960\7d57d138044525ac9efe1ec5d40dd8f9b08a1451\fabric-transitive-access-wideners-v1-1.1.0+e747827960.jar;C:\Users\inscr\.gradle\caches\modules-2\files-2.1\me.shedaniel.cloth\basic-math\0.6.0\1218655af0c83dd7678eaef234da0ddade95da0a\basic-math-0.6.0.jar;C:\Users\inscr\.gradle\caches\fabric-loom\1.18.2\net.fabricmc.yarn.1_18_2.1.18.2+build.3-v2\minecraft-intermediary.jar \ No newline at end of file diff --git a/build/resources/main/data/aspects/powers/negate_fall_damage.json b/build/resources/main/data/aspects/powers/negate_fall_damage.json index 6379c16..004407d 100644 --- a/build/resources/main/data/aspects/powers/negate_fall_damage.json +++ b/build/resources/main/data/aspects/powers/negate_fall_damage.json @@ -1,298 +1,27 @@ -{ +{ "type": "origins:multiple", - - "slowness_when_fall1": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 0, - "duration": 100 - } - }, + "fall_immunity": { + "type": "origins:invulnerability", "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 3.0 - } - ] + "type": "origins:name", + "name": "fall" }, - "cooldown": 20 + "cooldown": 1 }, - "slowness_when_flyintowall1": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 0, - "duration": 100 - } - }, + "kinetic_immunity": { + "type": "origins:invulnerability", "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 3.0 - } - ] + "type": "origins:name", + "name": "flyIntoWall" }, - "cooldown": 20 - }, - - "slowness_when_fall3": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 1, - "duration": 100 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 6.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall3": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 1, - "duration": 100 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 6.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall5": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 2, - "duration": 120 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 10.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall5": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 2, - "duration": 120 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 10.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall7": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 3, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 14.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall7": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 3, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 14.0 - } - ] - }, - "cooldown": 20 - }, - - "slowness_when_fall9": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 4, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 18.0 - } - ] - }, - "cooldown": 20 - }, - "slowness_when_flyintowall9": { - "type": "origins:self_action_when_hit", - "entity_action": { - "type": "origins:apply_effect", - "effect": { - "effect": "minecraft:slowness", - "amplifier": 4, - "duration": 140 - } - }, - "damage_condition": { - "type": "origins:and", - "conditions": [ - { - "type": "origins:name", - "name": "flyIntoWall" - }, - { - "type": "origins:amount", - "comparison": ">=", - "compare_to": 18.0 - } - ] - }, - "cooldown": 20 - }, - - "reduced_kinetic_damage": { - "type": "origins:modify_damage_taken", - "modifier": { - "name": "More kinetic damage taken", - "value": -99999, - "operation": "multiply_base" - }, - "damage_condition": { - "type": "origins:or", - "conditions": [ - { - "type": "origins:name", - "name": "fall" - }, - { - "type": "origins:name", - "name": "flyIntoWall" - } - ] - } + "cooldown": 1 }, "name":"Negate Falling", - "description":"You cannot take fall damage, but the more fall damage that is absorbed by the atmosphere, the more your movement speed will temporarily decrease.", + "description":"You cannot take fall damage.", "badges": [ { "sprite": "aspects:textures/gui/badge/equal.png", "text": "Neutral" } - ] + ] } \ No newline at end of file diff --git a/build/resources/main/fabric.mod.json b/build/resources/main/fabric.mod.json index e460bf0..4778322 100644 --- a/build/resources/main/fabric.mod.json +++ b/build/resources/main/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "aspects", - "version": "1.0.6", + "version": "1.0.7", "name": "Aspects", "description": "An element-based Origins addon for the Fabric modloader.", From 3ea810531b8472cd0a575fb76a6b49c20a9c1ebb Mon Sep 17 00:00:00 2001 From: Azure <80689879+AbyssDweller@users.noreply.github.com> Date: Thu, 11 Aug 2022 10:45:56 -0400 Subject: [PATCH 05/11] removed credits just moving them --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b04eb81..011b5e4 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,5 @@ Aspects is an element-based Origins addon, meaning it expands the functions and - [Origins](https://www.curseforge.com/minecraft/mc-mods/origins) - [Origins Extra Keybinds](https://www.curseforge.com/minecraft/mc-mods/origins-extra-keybinds) -### Credits to Perseus#0745 on discord for some of the fixes From 3beee7b9c4668509cf82069c202492a1daaef5d8 Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:01:13 -0400 Subject: [PATCH 06/11] Update lightning_immunity.json Made it so you are truly invincible to lightning --- .../resources/data/aspects/powers/lightning_immunity.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/resources/data/aspects/powers/lightning_immunity.json b/src/main/resources/data/aspects/powers/lightning_immunity.json index e99b566..d25ec59 100644 --- a/src/main/resources/data/aspects/powers/lightning_immunity.json +++ b/src/main/resources/data/aspects/powers/lightning_immunity.json @@ -1,12 +1,8 @@ { - "type": "origins:modify_damage_taken", + "type": "origins:invulnerability", "damage_condition": { "type": "origins:name", "name":"lightningBolt" }, - "modifier": { - "operation": "addition", - "value": -1000 - }, "hidden": true } \ No newline at end of file From 763a99fb94371d1c84926f355f67c90f2e4ce699 Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:04:10 -0400 Subject: [PATCH 07/11] buffed fleet --- src/main/resources/data/aspects/powers/fleet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/data/aspects/powers/fleet.json b/src/main/resources/data/aspects/powers/fleet.json index 7a7a5ab..fd26727 100644 --- a/src/main/resources/data/aspects/powers/fleet.json +++ b/src/main/resources/data/aspects/powers/fleet.json @@ -2,11 +2,11 @@ "type": "origins:attribute", "modifier": { "attribute": "minecraft:generic.movement_speed", - "value": 0.01, + "value": 0.03, "operation": "addition" }, "name":"Like Lightning", - "description":"You are an even faster variant of Anemo. / +0.01 movement speed", + "description":"You are an even faster variant of Anemo. / +0.03 movement speed", "badges": [ { "sprite": "aspects:textures/gui/badge/check.png", From 8bbc19cf31b1b32112efdea34f4b0e3d6c6ff6e7 Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:05:41 -0400 Subject: [PATCH 08/11] Update tempus_primary.json tempus' primary now goes thru armor --- src/main/resources/data/aspects/powers/tempus_primary.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/data/aspects/powers/tempus_primary.json b/src/main/resources/data/aspects/powers/tempus_primary.json index c3ef35d..4ef8f53 100644 --- a/src/main/resources/data/aspects/powers/tempus_primary.json +++ b/src/main/resources/data/aspects/powers/tempus_primary.json @@ -2,7 +2,7 @@ "type": "origins:active_self", "entity_action": { "type": "origins:raycast", - "distance": 8, + "distance": 16, "block": true, "entity": true, "shape_type": "visual", @@ -14,14 +14,14 @@ "amount": 2, "source": { "name": "lightningBolt", - "bypasses_armor": false + "bypasses_armor": true } } }, "command_at_hit": "function aspects:lightning_bolt", "command_step": 1 }, - "cooldown": 240, + "cooldown": 200, "hud_render": { "should_render": true, "sprite_location": "origins:textures/gui/resource_bar.png", From 74900ba3a2ed64ec44a6e44d9b6c1dc0e09d82f0 Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:05:47 -0400 Subject: [PATCH 09/11] Update tempus.json --- src/main/resources/data/aspects/origins/anemo/tempus.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/data/aspects/origins/anemo/tempus.json b/src/main/resources/data/aspects/origins/anemo/tempus.json index 0ad94a9..c60bdd0 100644 --- a/src/main/resources/data/aspects/origins/anemo/tempus.json +++ b/src/main/resources/data/aspects/origins/anemo/tempus.json @@ -1,10 +1,8 @@ { "powers": [ "aspects:fleet", - "aspects:storm_strength", "aspects:lightning_immunity", - "aspects:tempus_primary", - "aspects:tempus_secondary" + "aspects:tempus_primary" ], "icon": { "item": "minecraft:amethyst_shard" From fd8c6e4ab8b04fd43ae1daa2c7dbeac4507ceb21 Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:06:16 -0400 Subject: [PATCH 10/11] update version to 1.0.8 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4f38e0b..960b372 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.java.home=C:/Program Files/Java/jdk-17.0.2 loader_version=0.14.6 # Mod Properties - mod_version = 1.0.7 + mod_version = 1.0.8 maven_group = com.aspects archives_base_name = aspects origins_version=v1.4.1 From 6bdc51eaa5c02442eb8da6efeca6d77c1c92432b Mon Sep 17 00:00:00 2001 From: AbyssDweller <80689879+AbyssDweller@users.noreply.github.com> Date: Fri, 19 Aug 2022 23:14:04 -0400 Subject: [PATCH 11/11] update to 1.19 yes this is only for 1.19 --- .gradle/buildOutputCleanup/outputFiles.bin | Bin 20279 -> 20495 bytes build.gradle | 2 +- gradle.properties | 10 +++++----- src/main/resources/aspects.mixins.json | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index b3ff574d90814501ff98e3cb086a38230f4baebf..d71061a03202376d299e0dad1e45c507f0ac9e01 100644 GIT binary patch delta 301 zcmdl!kFkFN;|3E6#{9{q5(Wa@@29Wqsn;kvAu}!x3?VkL>Lj{Ui0sSXu2LJ#7 delta 76 zcmV-S0JHy(paHj@0kAX}0b`Rj7%-!K7z2~78)36195?}!b{+4NeI6K-tsWSY-5z<9 iZXdssMIi8#O(DROB_e_X30bir_!qG-zz(xPNcILf5*-8p diff --git a/build.gradle b/build.gradle index ffbb36d..ce30b9e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 960b372..8f5dcaf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.java.home=C:/Program Files/Java/jdk-17.0.2 # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.3 - loader_version=0.14.6 + minecraft_version=1.19 + yarn_mappings=1.19+build.4 + loader_version=0.14.9 # Mod Properties mod_version = 1.0.8 maven_group = com.aspects archives_base_name = aspects - origins_version=v1.4.1 + origins_version=v1.6.2 # Dependencies - fabric_version=0.54.0+1.18.2 + fabric_version=0.58.0+1.19 diff --git a/src/main/resources/aspects.mixins.json b/src/main/resources/aspects.mixins.json index 1f4dd34..514b170 100644 --- a/src/main/resources/aspects.mixins.json +++ b/src/main/resources/aspects.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "net.fabricmc.fishplex.mixin", - "compatibilityLevel": "JAVA_16", + "compatibilityLevel": "JAVA_17", "mixins": [ ], "client": [ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c849c9a..fe7a568 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,11 +28,11 @@ ], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.14.9", "fabric": "*", - "minecraft": "1.18.x", + "minecraft": "1.19.*", "java": ">=17", "extrakeybinds":"*", - "origins": ">=1.4.1" + "origins": ">=1.6.2" } }