From 73b090ec402ae7e707d75659e9ec1c8c17c04f88 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Sat, 23 Dec 2023 13:26:49 +0800 Subject: [PATCH] 1.20.4 --- build.gradle.kts | 1 + gradle.properties | 16 +++---- plugin/build.gradle.kts | 6 +-- plugin/libs/BiomeAPI.jar | Bin 11703 -> 12922 bytes .../api/object/action/ActionBarImpl.java | 39 ++++++++++++++++++ .../integration/skill/EcoSkillsImpl.java | 3 +- .../customcrops/util/ConfigUtils.java | 4 ++ 7 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 plugin/src/main/java/net/momirealms/customcrops/api/object/action/ActionBarImpl.java diff --git a/build.gradle.kts b/build.gradle.kts index dab03f5..0cd4af0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,7 @@ allprojects { maven("https://betonquest.org/nexus/repository/betonquest/") maven("https://maven.enginehub.org/repo/") maven("https://oss.sonatype.org/content/groups/public/") + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") maven("https://repo.codemc.org/repository/maven-public/") maven("https://jitpack.io") maven("https://repo.papermc.io/repository/maven-public/") diff --git a/gradle.properties b/gradle.properties index d508eeb..9ac195f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ -#systemProp.socks.proxyHost=127.0.0.1 -#systemProp.socks.proxyPort=7890 -# -#systemProp.http.proxyHost=127.0.0.1 -#systemProp.http.proxyPort=7890 -# -#systemProp.https.proxyHost=127.0.0.1 -#systemProp.https.proxyPort=7890 +systemProp.socks.proxyHost=127.0.0.1 +systemProp.socks.proxyPort=7890 + +systemProp.http.proxyHost=127.0.0.1 +systemProp.http.proxyPort=7890 + +systemProp.https.proxyHost=127.0.0.1 +systemProp.https.proxyPort=7890 diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 1c789c4..83a5551 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compileOnly("net.Indyuce:MMOItems-API:6.9.2-SNAPSHOT") compileOnly("pers.neige.neigeitems:NeigeItems:1.14.23") compileOnly("com.github.Archy-X:AureliumSkills:Beta1.3.21") - compileOnly("com.willfp:EcoSkills:3.8.1") + compileOnly("com.willfp:EcoSkills:3.36.1") compileOnly("com.github.Zrips:Jobs:4.17.2") compileOnly("com.github.MilkBowl:VaultAPI:1.7") compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") @@ -25,10 +25,10 @@ dependencies { implementation(project(":api")) implementation("net.kyori:adventure-api:4.14.0") - implementation("net.kyori:adventure-platform-bukkit:4.3.1") + implementation("net.kyori:adventure-platform-bukkit:4.3.3-SNAPSHOT") implementation("net.kyori:adventure-text-minimessage:4.14.0") implementation("net.kyori:adventure-text-serializer-legacy:4.14.0") - implementation("de.tr7zw:item-nbt-api:2.12.0") + implementation("de.tr7zw:item-nbt-api:2.12.2") implementation("org.bstats:bstats-bukkit:3.0.1") implementation(files("libs/BiomeAPI.jar", "libs/ProtectionLib.jar")) } diff --git a/plugin/libs/BiomeAPI.jar b/plugin/libs/BiomeAPI.jar index 470bb2cc76cb0f68dc8fceda4e337fde2f874cef..59096aa6a72df21ac35ace0683c84122b702eacd 100644 GIT binary patch delta 2602 zcmY*bc{tQ-8y>ST#wav2c7?%=jA$%JwotN$W7l#*=_?xRD8^8kQ%Lf&GsZHK$`Z0f zl8#;Wl*v9tM0T>oHV$e~g2$zaI_|1UdB694+rIVx}YBvK5Dh{}n$c>4?@O8g}?GLCUND>$2Ula)8JVvE1f?^_eW?azAxniJ@$ZTUY zIL5cHU9_q1oA=0=poE8il1}jnkLBh+2f42bwYoHWF_=&@^Vu8s$_1`Kn|w|yce$@8$< zeruO#oI{(+e#h0v$I2ck5FKuh8h{L&LhFqT-0=sJGP;d+{_LQ|#)V(4YmSz>L&(q+ zFkCrbZ4-o|JjQ?S^%Lsc+`lH2qVo|G653YZSJhJBREjW{9TcxPvZiOChYSK6R0*BKIt8%nbU8t#LCk^>FgXg4n4i#$7$wp5;cw zY5@sve{X(5ct-w8iU3^yKZv=ot}3@n#r@A>ZXQ)iq}UN~vghO&evdGDX^Qwqc}q9n znVrvxrbXP;9}7lf8+coy3-ZKvTsr0u60g@#Ja#GMki z(uepGZV#;tfdjuZc1w`d*8XDtr?=DEx%HTYgvJyt11`rmtBuD>W&So9P<)n3h(Z8v`1l%GoHt3=XjaQHlCPVj>`FM+N~wj(1sKppev}> zjG|OjnvPD!ZIqs{j@Bb?+chn~+LAkk{t)#Ly`1Xq>*Vviwtb1K{nVQfH2qaHZZs#5 zZ$1ul+EMt6DR1x7sCdSeUV@1o!?`yj$ENrAbf5{D0gKO5G&PI&QJj$*WF+KZdWEi} z%27lpol)DLd{!&*OV*IWj)Qgqxt7K^e6H@#K5LO>)WIroY7%@NkvpL)^;UW!i`!((g)+}*0-dfEXIsiZG_4+{$RchSM(az5OuS)-)uzwL?BfPnijtzV6)tQ9uR#mmK}v>R2`z5+Eo+Fa@Y9(hQo zLW808{B*RP=~qL~5Ei^W9>+_He~s0hNDBM9P^kWs&YX5VEs(BNpqtiHN8XAZts^&& z?(QrqgcE>Hlq^t$l;+9>1ceV$%&O{DKQ-ZXHjVI%baS5eXdaz;FXuPNV;*vgX+-UY z5(^A@f!avceYfgajwnWZ4zq;4SqX@r@~Tu{-UA4gi9qhc4>f<9qNzBVh^WX`ql~*y zvb>uOQTV!Q%!^^Y>p<2Yu1H_RaOPZ!Fm@LJ8x7 zD5@uQWJq1EwV}ehYKVfSDiM;~X{XLtNEUeyUWx?mAJ?tLk3(S66SCCSWHU8Y-Mh=# zBmD%s$|ua>-b45h3Tn!p`g{K51F-$w?yeLWd$pJCo}n>;ymZAMDEd+5m1HrbAepW< z6RElQd@?BbJyCbccdcc0c5{VlGnHgMc*2?1NWEhTt6bQ)VnV{|L=?R_>pc~N+Ieho zJ#%@I_(9LFtIAmOVQ1g8zMdH=w(jAscUED(6ElHGU zQJq=Jb`sj5|KR9qEiiQkk$*fwKDHR0WBDly%zR7c-H)1OU8PQ+>o17Wtuf86crw+8 z8?*H>DGQ2>zoBJ)^V6wSA=3A0d7ISS9MP1Tm+p7TEipGAAa7RWh0^awOEeCtHaERo z`GcChw2Wz2rO@Yd6^gm%u*&TTY4g234mIcWd@>2O_ljKlHO=y0nA|=*>VGKyk?nkN zRO-mNj7^K4zV;WlM&Rx$2g%j0)Q@g6LPIcL^`+!87?$tXg!4C3O zR((n*jMAjecPQi>HttJ!w5wVE^lq!=x5kz07hW5+b!AdyoK3r4sBR;3^*5GAqx^fh zP728D_?D*rrG@#r6ApbtxY-DuV3m#1z3NnoVn>&X{w7QJ}p+jZ>f+iMdl8xn2S= zR5p^~RBBYer=l1F0)@drAi_Usaln=g+v5n(qb#y_-8W@1@K3p4+_57fze);N9T5YA Xlzwr^M}+nXf&@XiFc9dCGRNS*3u~I- delta 1632 zcmZXUdpML?0LI76#~36uZexfRxy`ubl1j}kxo(?FA*9?wWsKXn8$-24M4wBB!6@P} zrrZ^U$b^T+k~X;&V~EMdCRVXCV=vD>d;U1*eSYVB-#PF5$NPtWv*#{H2N)m*fryGi z`l`*dcSQi?lz!LjE2=wdr7nz*M@^)8i(7A(RrVnO0%3_lAevyQf)Z#Zq(FkSUO7Q7 zXPtbAxd>61jE@HCjfV~h6r+fJsN^a$qI)Qzb`l%_7lj}XCNDZU!tr{MTaifN{ z5k^Qoii_(-V2wtxYq+!W zn74R*({3KSJsP&b>RvS#7OjRb_f%r=kATiRN- zlMVK5_hqEr#rcs8OY+hQqtOJp?Ul}><};T>yqU4s=Z{Z&?H#Cjqf_4#B~cf8xJ_o^ zT)_=nX1Yk3f-iKextSj6^fWYq6leX-;gGM1k2{la^_jfug~0`dDkm#uE@~)(Zl8K_ z>0-vgHDa!aE$Tg##yLTmFuRilU-X#hdkA-NHh0N)e!?KZUze{?ALrgA{-hH+Qsdts z?)=EBB;3&=!cJ$Z#E#Nu^}-o?u#&2OE+;A#Sti?%L553x z$vqFg)_hf^Hc;&phO_Q1WG}ismyYW<{B|jbY}9s+I~@OIKFUA)u52CM?RSP`i=t%r zL`QSbw%z!K3N@feYv!tvx6wK6nO7Ar?&-?u&5V=ev)X?SFQzihW)~A4t*+N{OTzR|jPp+fdw$tvysRIw*Ba zHeN?83!m+Zq^j54mPwP$zO7!U-c0V_Djv6K9%Eh~TP0eDh$Y!P4@XLBe~yiA&%tbv%)Lgr=l?GHaBzzwJYGW%-onw{M78 z3V!)Q;DbJ&Qnqwt&wK)m`?Qbdkr^9N9|E)m~fwfls-|Kfw@Mb9p_j{5sNK;S&Gq5{mKq?jmZRIl^a0V*_|UjCjZ>a z7s^t+4-G)P!5+llnaqPe`m#_BBuF!`MDQbNMRRR-;CThXX=B4Zf`mW^Llm?S&0`oa s$52j?70BQ*s;Yo};W2({ptKPRTB + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.momirealms.customcrops.api.object.action; + +import net.momirealms.customcrops.api.object.ItemMode; +import net.momirealms.customcrops.api.object.world.SimpleLocation; +import net.momirealms.customcrops.util.AdventureUtils; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.Nullable; + +public record ActionBarImpl(String message, double chance) implements Action { + + @Override + public void doOn(@Nullable Player player, @Nullable SimpleLocation cropLoc, ItemMode itemMode) { + if (player == null || Math.random() > chance) return; + AdventureUtils.playerActionbar(player, + message.replace("{player}", player.getName()) + .replace("{world}", player.getWorld().getName()) + .replace("{x}", cropLoc == null ? "" : String.valueOf(cropLoc.getX())) + .replace("{y}", cropLoc == null ? "" : String.valueOf(cropLoc.getY())) + .replace("{z}", cropLoc == null ? "" : String.valueOf(cropLoc.getZ())) + ); + } +} \ No newline at end of file diff --git a/plugin/src/main/java/net/momirealms/customcrops/integration/skill/EcoSkillsImpl.java b/plugin/src/main/java/net/momirealms/customcrops/integration/skill/EcoSkillsImpl.java index 794ace1..b2dfc49 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/integration/skill/EcoSkillsImpl.java +++ b/plugin/src/main/java/net/momirealms/customcrops/integration/skill/EcoSkillsImpl.java @@ -18,6 +18,7 @@ package net.momirealms.customcrops.integration.skill; import com.willfp.ecoskills.api.EcoSkillsAPI; +import com.willfp.ecoskills.skills.Skill; import com.willfp.ecoskills.skills.Skills; import net.momirealms.customcrops.integration.SkillInterface; import org.bukkit.entity.Player; @@ -26,7 +27,7 @@ public class EcoSkillsImpl implements SkillInterface { @Override public void addXp(Player player, double amount) { - EcoSkillsAPI.giveSkillXP(player, Skills.INSTANCE.getByID("farming"), amount); + EcoSkillsAPI.gainSkillXP(player, Skills.INSTANCE.getByID("farming"), amount); } @Override diff --git a/plugin/src/main/java/net/momirealms/customcrops/util/ConfigUtils.java b/plugin/src/main/java/net/momirealms/customcrops/util/ConfigUtils.java index d1fa224..05bba98 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/util/ConfigUtils.java +++ b/plugin/src/main/java/net/momirealms/customcrops/util/ConfigUtils.java @@ -252,6 +252,10 @@ public class ConfigUtils { actionSec.getStringList("value").toArray(new String[0]), actionSec.getDouble("chance", 1)) ); + case "actionbar" -> actions.add(new ActionBarImpl( + actionSec.getString("value"), + actionSec.getDouble("chance", 1)) + ); case "command" -> actions.add(new CommandActionImpl( actionSec.getStringList("value").toArray(new String[0]), actionSec.getDouble("chance", 1))