From c31ec9b8a87c39a314fe3cf6b190fba6f6566c85 Mon Sep 17 00:00:00 2001 From: Big Pappa Date: Sun, 11 Oct 2026 09:39:10 -0500 Subject: [PATCH] Initial Development - /cab list complete. --- .../rstaxi/commands/CabCommand.java | 74 ++++++++++++++++-- .../rsscripting/rstaxi/stops/StopManager.java | 29 +++++++ src/main/resources/language/en_us.yml | 22 +++--- target/RS-Taxi-0.1.0.jar | Bin 16816 -> 18631 bytes .../rstaxi/commands/CabCommand.class | Bin 5888 -> 6781 bytes .../rstaxi/stops/StopManager.class | Bin 2837 -> 3957 bytes target/classes/language/en_us.yml | 22 +++--- .../compile/default-compile/createdFiles.lst | 1 + 8 files changed, 119 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/rsscripting/rstaxi/commands/CabCommand.java b/src/main/java/com/rsscripting/rstaxi/commands/CabCommand.java index 958b946..eeee74d 100644 --- a/src/main/java/com/rsscripting/rstaxi/commands/CabCommand.java +++ b/src/main/java/com/rsscripting/rstaxi/commands/CabCommand.java @@ -159,12 +159,18 @@ public final class CabCommand implements CommandExecutor { } } catch (SQLException | IllegalArgumentException e) { - plugin.getLogger().severe( - "Failed to create taxi stop: " + e.getMessage() - ); - sender.sendMessage(plugin.getLanguageManager() - .getMessage("stop.creation-error")); - } + plugin.getLogger().log( + java.util.logging.Level.SEVERE, + "Failed to create taxi stop.", + e + ); + + sender.sendMessage( + plugin.getLanguageManager() + .getMessage("stop.creation-error") + ); + } + return true; } @@ -191,10 +197,64 @@ public final class CabCommand implements CommandExecutor { return checkPermission(sender, "rs-cab.delete"); } + private boolean handleList(CommandSender sender) { - return checkPermission(sender, "rs-cab.use"); + if (!sender.hasPermission("rs-cab.use")) { + sender.sendMessage( + plugin.getLanguageManager() + .getMessage("general.no-permission") + ); + return true; + } + + try { + var stops = stopManager.getAllStops(); + + if (stops.isEmpty()) { + sender.sendMessage( + plugin.getLanguageManager() + .getMessage("general.no-stops") + ); + return true; + } + + sender.sendMessage( + plugin.getLanguageManager() + .getMessage("list.header") + ); + + for (StopManager.StopEntry stop : stops) { + sender.sendMessage( + plugin.getLanguageManager() + .getMessage( + "list.entry", + Map.of( + "icon", stop.icon(), + "stop", stop.name() + ) + ) + ); + } + + + } catch (SQLException e) { + plugin.getLogger().log( + java.util.logging.Level.SEVERE, + "Failed to retrieve taxi destinations.", + e + ); + + sender.sendMessage( + plugin.getLanguageManager() + .getMessage("list.error") + ); + } + + + return true; } + private boolean checkPermission( CommandSender sender, String permission diff --git a/src/main/java/com/rsscripting/rstaxi/stops/StopManager.java b/src/main/java/com/rsscripting/rstaxi/stops/StopManager.java index aff4bff..9012c55 100644 --- a/src/main/java/com/rsscripting/rstaxi/stops/StopManager.java +++ b/src/main/java/com/rsscripting/rstaxi/stops/StopManager.java @@ -8,6 +8,8 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; public final class StopManager { @@ -17,6 +19,9 @@ public final class StopManager { this.plugin = plugin; } + public record StopEntry(String name, String icon) { + } + public boolean exists(String name) throws SQLException { String sql = "SELECT 1 FROM stops WHERE name = ?"; @@ -61,6 +66,30 @@ public final class StopManager { } } + public List getAllStops() throws SQLException { + String sql = """ + SELECT name, icon + FROM stops + ORDER BY name COLLATE NOCASE + """; + + List stops = new ArrayList<>(); + + try (PreparedStatement statement = connection() + .prepareStatement(sql); + ResultSet results = statement.executeQuery()) { + + while (results.next()) { + stops.add(new StopEntry( + results.getString("name"), + results.getString("icon") + )); + } + } + + return stops; + } + private Connection connection() { return plugin.getDatabaseManager().getConnection(); } diff --git a/src/main/resources/language/en_us.yml b/src/main/resources/language/en_us.yml index bc79911..1e52f05 100644 --- a/src/main/resources/language/en_us.yml +++ b/src/main/resources/language/en_us.yml @@ -14,27 +14,27 @@ database: connection-error: "&cCould not connect to the database." stop: - added: "&aStop &e%stop% &ahas been created." - updated: "&aStop &e%stop% &ahas been moved to your current location." - edited: "&aStop &e%stop% &ahas been updated." - deleted: "&aStop &e%stop% &ahas been removed." - already-exists: "&cA stop named &e%stop% &calready exists." + added: "&aDestination &e%stop% &ahas been created." + updated: "&aDestination &e%stop% &ahas been moved to your current location." + edited: "&aDestination &e%stop% &ahas been updated." + deleted: "&aDestination &e%stop% &ahas been removed." + already-exists: "&cA destination named &e%stop% &calready exists." invalid-icon: "&cThe icon &e%icon% &cis invalid." - creation-error: "&cUnable to create the taxi stop. Check the server logs." + creation-error: "&cUnable to create the taxi destination. Check the server logs." teleport: success: "&aYou have arrived at &e%stop%&a." confirmation: - update: "&eAre you sure you want to move stop &6%stop%&e? Confirm the command to proceed." - delete: "&eAre you sure you want to delete stop &6%stop%&e? Confirm the command to proceed." + update: "&eAre you sure you want to move destination &6%stop%&e? Confirm the command to proceed." + delete: "&eAre you sure you want to delete destination &6%stop%&e? Confirm the command to proceed." expired: "&cThat confirmation has expired." list: - header: "&6Available Taxi Stops:" + header: "&6Available Taxi Destinations:" entry: "&e%icon% &f%stop%" + error: "&cUnable to retrieve taxi destinations. Check the server logs." platform: - invalid: "&cYou must stand on a valid taxi platform to create a stop." - + invalid: "&cYou must stand on a valid taxi platform to create a destination." diff --git a/target/RS-Taxi-0.1.0.jar b/target/RS-Taxi-0.1.0.jar index ef7aa071ebfd11c2f593c6af86cb40b2b3873805..5860160691f3f969bd5f3e3759f81cd90af0ac4f 100644 GIT binary patch delta 7460 zcmZu$1ymf%wjC_kV1v86hoFNy!CeEvgS!S8EO@ZN-7U!A5ZqmZOK=HaMk_>g=^)A#g(pa6mOh1Vl6d00jVGR!RWU!#_QFLf}&s6I!UA zpDS$eOiEA`IG$$^ffN20Fhftl=+GKCl)sxI!syVGf0|VAxX(Sj@PhCuicn|x=d{pN zc-Cj=hX+3c9D)>xNlEcd3}xVH0T2N2CjkJs08nbtmym2dbZ@NzViBnQFULgmNOT3g zP;B_b`1nd;X(en0$?2s)aVj*uJ*(?Pw&m{}?@!G%s^X%WqHfBXh_u+6@bQl_ks6AZ z78V#+3>xQuml+H+X*4!=V*Bp@u&PIG%gErg*q^-rIVJWd%gri`5mT&zP`t2gSmMP? z{3R`m9u7!+m#krF>w`hwy1(oy$+|h(lJyb=_ zsJcY>(w_{EPpNA4z{)L^;Ed$Qi>fMWozlX1vDqK!C^2>_JoXA>8U&4KVdzTA=C~Jj z`$unE#yXgcZRYPqYph=M2@-|*wZ@twz8>o`i(P_f$d(aB!Uvg4hGe5EsUA@KBgVAL z=Lt^;^Z~?I2#8F|Lc4EE&_K~e@;T5r_;)$2@K zd`B|Xm_s|-j16oiCMOD@%;0YKs}*U<@unZ$K)B2wSLvAJ7Iu24Xw~M&Y)!xY!A)#aA;EM6#!qR`q;ks?@G`fqO!jxkaHPkp*=Bo3HEzz4fJoki?`bvLT3IPD zr~OL!Aq?s*s4kPho3~nt`4n9KR&o7WaniCp1WbBm+dwuD(Ot0~fpgQb6%Q^xH4*46 zeeyw`XOgnn1B*oKxEmCNbK)zGW%qa#kFTiBwRt+yqrs**U9qi{MZftdM$RJxbP0ku z65WH+v~u8`<@oo^kaSoC3XVJ)spcDq@*P#P{Md z*wnr5%4(yg<`;ArH{oTC7*;v8ToT4rF`EVLNvwaHO>(NAlN+(*-K0JK;7Loa zyeMH%I2lU>?V?vg;q~zo+GxW4bq6m+f+TJH+^H~)6ifwH%aWRO%aQ|5}0UAz8O(jn@>O(L3gUMjGOp?Pi)$@^TV>6%cu1(Hj0d5}E|5kaw$Wpr zcY1lesuOwBro9&OUO}u}N+Qn6V3)Z7K;L?NT$a4tZZd!;OvMFuxI{3}Xib1SX`o`h z?mnLHK=Z`$TzF?*wXt5;(ptM(7+%yEEYgm533j}=yYiecA#{v$cgaQtLzvsKKHUfg zNQ~-zvT5G6Q}Vf>xLIb==3Fq${Agm98!V@FkJh#SS(E5!LEqlV#@@kbmTB|#p3(~T zeHleh+gB3VrBCFrkA%;&kjpYH&j@1Rz?O^FOiood}3sh@w=FO zYtzRd)1;a1=QmN9;W?MOHpEwe3z{?#(OX^_sDr&)A$5H@J^vA#bubI60;1>fE|@MtIVZN5*cVgLSpqS+3sRbUQ}F zeSAY*KNPeWc}8d2>}Y`5-Xpl1T<|$Wda-YI-H_!mtht;@6gs%@p%&uY-LHJ^sS*G< zWw~jKf((yj%Vlx_a=_?Uj+!f-rQ1}GG8m{Z)3Zhv4iq#|>@>c)<1J}@Ct#W>$JvHO zOe3DiuLm5)3m>|(jiDhH(Ox?JJFNlh1wriT&+g^s;YAVt)G$AJ-z$$-6G61?;41{N zO1Ep&FGQCepL^&Hh9Nu^aXJR8pXAelaYfk{bOalspiz5%{{x zSF(5F3*lxOXJ&S3wTT_HcTd`xoi1r5!DvcdKi^n!A?by3-s&or@w1ddw{sk*htz^ z2|%W*r-nFeG8tmQC~V4t4@Qu*pu$zTtw7eh(6&$ZOQ{lX7!ZN z()tmqan2RSUbFV0J=?j?nCZCCv)6;N>ZLTn9|Flo@{t6jOP%2^8KOA#UdJo_uc0(# z@nXd~cxx^R?5<{RQ9p^ZdpkooR=-XRSCzRh7ZA1eS&l)n2nKF4Dr3?;b#?G8S8d#= z|5%E6{$@PZx4q*&c1iKTUN_WN`H-oB%r@BYz8Pk8JnE_=t3Drno6d8x%9XmIS#_Gu zck3_QRcg2at=siN?NWtxqMuxVb2k_bHasm$I=TZ0{d1z0;>PE_A2aPI(6i`vB4h$) zWAy~V#yJoW=dr%*OiQ7YKUsp!o)f5^p<_8cd&@8WREn5F3Moehf2w=uT&QHnK{Uit z)LO4qG;R1mB7xOH)Y2i1$kFmHZy5J>yu6Z}HVYPsQ%U%C>5NmY)S2hvrZ9!&eq=k) zg(=eM5uJ=~%qKZ6ubi+o`EI(wnKX)pl_C^0zz@laE_}BfvPTR%DRa$fLpFH9S6Eh2 zW7zz8)v~z?;=|)Zj-(<%u@9p2aL&)^&KyIU>O*8`ASrbTQcnBu7yPf_zDAB_(G34q2 z(}>RyZk3~E#I@GU5dT{8P`R{_wO~oDuqCNOzqy3C+CpVVZGf+8kY<=SQ+>0}aE~i> zeVKURs-s-4ZiHUW{z%5908;y@{3bLkGho@XQLGw^+EtuFn0iRJ%P2G8RYlTa4%GvZ6_)Mff6h z)|lFt*j8p(7hn{F6WeC?IH?!fzJkXP(wne062pPU7G?VZ@@>yG=BA%G-u%Z{n-tM% z#|nd^i1~hL3}`Yq^Io*7fm3B9`bO#uoUym#mwZW)>P0D%ak!z1F)1wUp1;)N8wHT` zqt#)?L@rZf{VXnQ9ZP9J*V{SQJK1U0(RpL>{Epr+`EqHV;WQ9kCNm%@lSVuwR;=f+ zZoJv;|gR^_9s6QLE`VzVRat8+fu5djhb5e7%}%pxg7UD^sD-Q zb)>nBD3D#3U^@xW9+s+t**!`*1M27)Zbi_RTzajtj!nI*Tk)E&Xp-AG-NiYc&BH63 z2RfSvpq%iK)TIwa4(BFfdjttZ5o5h^TSb-c-JD8R<^k(MO3`mT`Ev+Ea48HeRfM8 zuB=MNH;}Bk4K|9m4VS}3K7ZGX3gnez8a5}QmEnuhqwLF+66=n_r6ynm=&;4oI+^EN z21_PWGw2hsS}+rO>UZ$@;5rv-0$4Z`ipBo@D%3-IdMbWx2YIc`#cuJ2X>_)l>yk4w}c}#9L2`by>@+gG6#F8@myqrPA0%U-{dpCawGJU!0-qslVSy?wEN5RtsCNP{`*nX3!wXz}V8U+(T$CudRkf+6b%{ zuY5(pCz73AuQ$KA*Fx+f+BU4SNgV)d4rJJ)o2vwsdt~;yEEezBrdi5gLoyI~zqt=X zor>Ja7xyv52pOZof!w_1KD-gAFFxk&*6j4) zhy15|-=4bA6Lqv?l~30s#t<&0>!i4_R3I*)R5_(6(a#1HN%wR~_bZ#3Y3AZ4_>lmv z6)pa6Q|!N2)K;S{Xzp;?GQnXf*&>6R3D!b5-4fUD6Tde5GmU@)y)@>=!OR!fKV}69 zXc{$U_Ni;GQJ#n-R7;KheK6fw$0y`mWprU+f@ekaE!SBU<4+eQWXS$lsLoY{l^bKr zBj=qu<(Jo7QFm$QWLOOsT*2Zr%aqd`qcouDY0Pi7!b{OEh&EWs5(`j4VJaV_{Jc*A zst3a4eYBy>Rv}T1fd|G@QkU6M6y{n%`0c$*CjWDJD88{6bB!xO1^_&;000gE0ATLq z!0GA+WfsMGS_g!XY@Itd+(rDy1p}MCE3+5?V}USVXt2FS5~3t%^(Kftgj64Xgh&Z} z!r<#tZynufwV9wlo$_q^N|Ayhs}@FLaP!b$OzU0!tXBklB&D)`PT#i zYAdzv*FRbhvffW!XS@A+JlTLeq6Z3yYR|yu!s~}n!l9Bw7GqLl^u98U4`}c#j#tuB zPv^4kX2GF$$}eiM2EWtJvwauBK%L0WG03($Y0#PoEljWk%hD6pXPb@0THa)Fp$%r) z%qTOPFrSx#-U7~%bgpVEk|9yDm4)%RUNttu6=h@dMS}C z_iY-6K#gh(Y0_glYiOn6_okaocJ70vUeqQGN}7;*nl=ZkV8m^zqk{Qor~&k2Y{V() zF2Et9SLleFk@993$uZ{V!~V+PtWU(_d~7W<6n-*2#u#@nlir*vZTg0l63w5?`8+Q> zM^rR>v#Ynb$&&KY@p%kA$A4OWF~A{EMpnr56g;(nD7gem-Bbkkk;GEbP&cT{1RHU& z#ws3J=6|i)Dw795_)HpAt7Uy2pcfV92-mDhvsl$Yxvd)njMQs<*6qC13pWC4&ii{lxpQf?iuwbn; zx7}O>=4AS$Ol@T78|hkwp=3~BK$Zqqo+-A}c=Qz-2+vpkVwe}1Gy=C&pvn}n5HYhN z)d(hs)L>3BxoQ9Le#R^vfO9i^^KLPT>vsku?BH1TizHV*wLYN{L9iRiB<(~7h-9$t z*jq^;XU-W;6BrvibRpB{@(??JZ#>JzUManMfSB03eN56B#JW49SczV&zh83fA{^oL z`tXXy!CRTWv73}oe=PfmN|Ql8 zTY0c!iSH;+(&>d2+?s`nZaF8~qeqzH z@T}9-S8-c|)7dyD(-w-hO8n%t%mYSYuG{OlqmzD_L`YzYMgCcrb%mhcz)g+$c;HUw(W@!UPX9u z!yXTc&$Vy%{R(Os^8e(&&E_n@Fkw0)2!8se$;sb2fX-&h%MwozCAwGO1ZJ~lehDui+1Iw zbuVfU$_Lz}RX@9)W51@pA#0SEo(0K-Q2v_*{V#*p=M0;Zp}LU}r!9x-nNs%tlDt#ZhBl;d#=i=Z-0SSt0 z$=*D#5iTq1%FO>1$$8d$`DVPu!+Y*i-`(*kEm>?p(06w|%yjMX#y}{Nmn&hkc9Mbf z`NGkL47DdenmXjIWgSP{+_CE)gwaKYs3{3s8xth!W*|Yo2=cBO7`8krUb>~LMI%(S< z^*7n8eFJO}8?^V7&nG;TTb!hxfO{4WBCn|UrbRW)%i^iZMSZGrK~JZ=y{V(MhpDwC zr=_EbhZ~2FgMG1$r>Gj9?5l#7jH?6w#IpX%GG)kVC8T^2FO6n~_%QJf5~uJEW3( zE5{{03nPVNwRqtr+W1~ffStECK@%#B4phb$BaH;_?H(f;mb9C^ny^n03zEPFYE=c!!!Ic_v{6`4uw%@*RdXK8VxZ#xN}Y zjT_EfhWj@KZsPFPuNE%CW?AeSg2x_@E$B!?#x}h^jvxJ6UE~-WoN3_#T^~-U6$vc6PRCRM^#bQhis+lyoYSM#S#;8Y?w; z%|>_r+Hx555Iz~C!R7wjaPOvi+z+{=18d!CyYrZR4TJmq0jjV$L5e;4kr9KVC33)d zpS}DM`JeJLMX~-JuQ=k9!Ue4mjDOanPK3#zdP2m{rkjxXb4Q~P*E1Xl{Uv(QgQcD& zEnBeCzkm!n2j=?Qq!Ipa)A?U!fw01}^mQW4`<#(Z!{}^cJdOoRi+&BOL@6$5+`zi`zBm65sL>Lu1 zjsH(Ta+-P$@l$mTc&e`X|Mq^uqM$3vzXIYZsGtF2z~^ye#K_>y8UK3wNDqWgiT!KL z|0JmY z%EtP6Q}~~0{=aSHpEN##&^U3b=h?0mCxgcjhE9p|!GlGhI0(#8E(u(!)Td3TgEX#1 j>Hg2zQx*TWBO)|j0)$BdAOXxi&Dw_e^8o(^?U|(s delta 5621 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 delta 1522 zcma)6U2GIp6#njP**hJk-DSJ>FR-*&ThoR%B_t*-A=0i0ioO8B_@Iv4E392+nwhbt ziOKrlYmLc$(fA_%H6*4Z7-oXQMvUFW%)D!)}6*^8aRCvDA*P3yKkMIvTJ)Vv~7}m)bN^2kKsAI7x{xa}4{^9snvAN37 z@Tk>qwdE{(e_Ph>cX~zJZr{z?`$K};t&H!u0}RjJy6c9(aEl$5-IEhu!!F0^eXOrj zPV?%@>*2zvJp+A04wbE!PnhNT>)qW}F1I`Di%te}r)>+jJ7;;G@HiG3ZduWuoH2&f z|A#U}!vfI`u0sRE2QnFN&~RRM#5ZZUAnkZVp+Gd;jQT>{EI}KH#IB-(V`qwdov2gg0+CrNPzTu2 zBTW^9tiGj#H@^-(im@6Rj*a0>U=$}>!o|B2Q}SGLtBwnl5yduHebY>Sh&_!%>>0es zp2JJ*5X~>+6*i1l*$B;}I2=^|6w1(2tUQZN_!i%RV-Ra_h3K!s^W^=WtSE-igdd0l zC)7s#NK$cC;SyJ}3L=s&rte7I8at zuAcij=H>CqWFGU2)Ky+wB*i#3gbz?t(U@wh?&274A{n$swiZic~ zO`W4L8gzRk5TP!NSt3HhFP#Rx&@?TNZ7T*nx>8W2m&H7{OriPl6@%W19pNFu7UHFD zhGPHVGN2OyW_Ww_8`x{=w^l$JkXLG&9}k49CFy`EI=QD1!)YWjjViL&Qn0#=p_r*6 tT&gH$3O~~U(4d+f0b5JMFJx-?6~ED}(_Vkl`#Y}DmqFG7U11G1{{b1obISk# diff --git a/target/classes/com/rsscripting/rstaxi/stops/StopManager.class b/target/classes/com/rsscripting/rstaxi/stops/StopManager.class index 4f8ca08aec9a424958ab9653d37ada509640f444..37e1d5acfbea0fe52bb1d618d2f770e22372b18e 100644 GIT binary patch delta 1724 zcmZWpTT@$A6#jN{l9QaIv<)?tw$QX-xfIH1v0A9KDF$^6i6+<90SMunC2fx~=)wyEt?^Je)X^PC>!U_vAek6TYn`!ZS0I}k8_#Od*yEvC z;AD?92RfqRaIiZRh(tSr@sOrM7bqXm&+E;Txn!z2n91nV;bb?m8d7?Cs5v??VkB~H^}QNi z#FUC@FJ8jS0+sVKm1bP&a=(fh6?rdazyDTg73Lp~gJRzFJNH*yWh5CVJCSORKN}8B zC5-W0ax870b_UJs&gx+gTL`97R-;(~UtN76uVlt5s7=5jNfp?3ugM=COX#UndM2q4 zq>S$AaiiN31UfhQ9y9+`?kA;()+udkXKZ&oIh59OlNn;3yeIkpDDOs;`LlE169S%y zkv{+kO>5XzM64UAmNtg7LD`5ZLdrJBD*EFCmZ7jP z6K=shz9!kw+`maSIxK^xgPhA?^QK|A|Ajx2)g z{3PaiUM1FIsU1$@Z%A$&yf2lwSt@d4=~9v#N_l*Uk4Tq-?<8T0B&-Y0e=%3!>4f+P zTZGkcfxiM9M+(LgQ|bmXinbD28=4pR7@siR9M|g?R;u=~#6@3UcoqFUw=vMwu#Bw- zS5R(4q-h0v`Q1_~loeD9!VWa9BGFT!_>2_{*+Ai(6mDa51>-iHzPa{$g>nZC7NTC@ zCIaSyTDhg^4r&>!(b80ztLpB2<1IE^g{RR=)^!Zy98W*L6&HD4#ubjqnufKh?byoy zPSzae&PKQtQF=Z@bPRQf^R;xN70+=BamG8th!Ms)!$=Wa=WTs+dy1RuNB&Z2br*}{ zv138<&u7Yse2UM=_vcLP<<1l|Ur=K$b04%dW-smRL}8bK#>nQaEt*P$_#3vc<&)>@ z*@Q3dDLpn!Yk}!(?83&4^05$34G;6=yMd?S2dK+9zl>LINjHlur!@7+rmf29R_gDD X^jgH1)_1~s3JH8gl_n(@zDC7=0)t7U delta 817 zcmZWnO-~b16g{tN?y?R)pWbI-l^oXqd=b#MCn`j@W&PGO~;E;v1D zT*M_oHG|8TRv6HWexH8pp3Tl+R&XVQIph?|=J`YDh01m6)rA>dk&=3#=VZ5ftY1i8 zlGR#GVL}(&LH$GeU1xr}QP;m@P_O%83nTE6;8cYi0%RCDj9tw0yvl5fsKL|4&rrqv zpCD~!30&iuMUrO^8QYN}|2nhYs2U5XGb7J-RqWQlA~E(W=?-gy=j?N!z=@K z5a{DVJJ~wVRt1C@z!1-a*o9+^C;4`sHD=T(*9>t2H*k|HWZC)_Zrhcb-SJJ_!Cekd z^1jC?fhL(t@H=ej34FoWeF1-Y!CnQVI;?Rmu<;HhD0QebVi-Udg8oWe5yRQ7ypjcc zJmg5@>LdQ2pk-Xpjo_yhK1J_Y=e1QvNkYk;VG8sjDvU98^?Nc2HsyRN0v;g zKiH;>BOAg6;}O_3MK-w=W3=l(?FsIdqXXuv8sn{wG6;$vA#1p>hT40k(Rbw$1x{K` O85;+&5`|~B>iIuN({9%Q diff --git a/target/classes/language/en_us.yml b/target/classes/language/en_us.yml index bc79911..1e52f05 100644 --- a/target/classes/language/en_us.yml +++ b/target/classes/language/en_us.yml @@ -14,27 +14,27 @@ database: connection-error: "&cCould not connect to the database." stop: - added: "&aStop &e%stop% &ahas been created." - updated: "&aStop &e%stop% &ahas been moved to your current location." - edited: "&aStop &e%stop% &ahas been updated." - deleted: "&aStop &e%stop% &ahas been removed." - already-exists: "&cA stop named &e%stop% &calready exists." + added: "&aDestination &e%stop% &ahas been created." + updated: "&aDestination &e%stop% &ahas been moved to your current location." + edited: "&aDestination &e%stop% &ahas been updated." + deleted: "&aDestination &e%stop% &ahas been removed." + already-exists: "&cA destination named &e%stop% &calready exists." invalid-icon: "&cThe icon &e%icon% &cis invalid." - creation-error: "&cUnable to create the taxi stop. Check the server logs." + creation-error: "&cUnable to create the taxi destination. Check the server logs." teleport: success: "&aYou have arrived at &e%stop%&a." confirmation: - update: "&eAre you sure you want to move stop &6%stop%&e? Confirm the command to proceed." - delete: "&eAre you sure you want to delete stop &6%stop%&e? Confirm the command to proceed." + update: "&eAre you sure you want to move destination &6%stop%&e? Confirm the command to proceed." + delete: "&eAre you sure you want to delete destination &6%stop%&e? Confirm the command to proceed." expired: "&cThat confirmation has expired." list: - header: "&6Available Taxi Stops:" + header: "&6Available Taxi Destinations:" entry: "&e%icon% &f%stop%" + error: "&cUnable to retrieve taxi destinations. Check the server logs." platform: - invalid: "&cYou must stand on a valid taxi platform to create a stop." - + invalid: "&cYou must stand on a valid taxi platform to create a destination." diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 30b5f53..09b45d3 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,6 +1,7 @@ com\rsscripting\rstaxi\stops\StopManager.class com\rsscripting\rstaxi\platform\PlatformValidator.class com\rsscripting\rstaxi\RSTaxi.class +com\rsscripting\rstaxi\stops\StopManager$StopEntry.class com\rsscripting\rstaxi\commands\CabCommand.class com\rsscripting\rstaxi\database\DatabaseManager.class com\rsscripting\rstaxi\language\LanguageManager.class