Upstream/AxTrade
1
0
Fork 0
mirror of https://github.com/Artillex-Studios/AxTrade.git synced 2025-01-19 21:11:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.8.1

Browse Source
This commit is contained in:
BenceX100 2024-10-22 10:03:11 +02:00
parent 3d945b12c7
commit 2f4dbc331d
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.artillexstudios</groupId>
<artifactId>AxTrade</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<packaging>jar</packaging>
<name>AxTrade</name>
@ -106,13 +106,17 @@
<id>rosewood-repo</id>
<url>https://repo.rosewooddev.io/repository/public/</url>
</repository>
<repository>
<id>alessiodp</id>
<url>https://repo.alessiodp.com/releases/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.artillexstudios.axapi</groupId>
<artifactId>axapi</artifactId>
<version>1.4.332</version>
<version>1.4.385</version>
<scope>compile</scope>
<classifier>all</classifier>
</dependency>
@ -252,7 +256,7 @@
<dependency>
<groupId>com.github.Emibergo02</groupId>
<artifactId>RedisEconomy</artifactId>
<version>main-3338e61c6c-1</version>
<version>4.3.9</version>
<scope>provided</scope>
</dependency>
<dependency>

6
src/main/java/com/artillexstudios/axtrade/commands/Commands.java
View File

@ -64,7 +64,7 @@ public class Commands implements OrphanCommand {
@Subcommand("accept")
public void accept(@NotNull Player sender, @NotNull Player other) {
var request = Requests.getRequest(sender, other);
if (request == null || request.getSender().equals(sender)) {
if (request == null || request.getSender().equals(sender) || !request.isActive()) {
MESSAGEUTILS.sendLang(sender, "request.no-request", Map.of("%player%", other.getName()));
return;
}
@ -75,12 +75,12 @@ public class Commands implements OrphanCommand {
@Subcommand("deny")
public void deny(@NotNull Player sender, @NotNull Player other) {
var request = Requests.getRequest(sender, other);
if (request == null || request.getSender().equals(sender) || request.isDeclined()) {
if (request == null || request.getSender().equals(sender) || !request.isActive()) {
MESSAGEUTILS.sendLang(sender, "request.no-request", Map.of("%player%", other.getName()));
return;
}
request.decline();
request.deactivate();
MESSAGEUTILS.sendLang(request.getSender(), "request.deny-sender", Map.of("%player%", request.getReceiver().getName()));
MESSAGEUTILS.sendLang(request.getReceiver(), "request.deny-receiver", Map.of("%player%", request.getSender().getName()));
SoundUtils.playSound(request.getSender(), "deny");

1
src/main/java/com/artillexstudios/axtrade/listeners/TradeListeners.java
View File

@ -46,6 +46,7 @@ public class TradeListeners implements Listener {
}
if (request.getReceiver().equals(event.getPlayer())) {
iterator.remove();
if (!request.isActive()) continue;
MESSAGEUTILS.sendLang(request.getSender(), "request.expired", Map.of("%player%", request.getReceiver().getName()));
}
}

10
src/main/java/com/artillexstudios/axtrade/request/Request.java
View File

@ -6,7 +6,7 @@ public class Request {
private final long time;
private final Player sender;
private final Player receiver;
private boolean declined = false;
private boolean active = true;
public Request(Player sender, Player receiver) {
this.time = System.currentTimeMillis();
@ -26,11 +26,11 @@ public class Request {
return sender;
}
public boolean isDeclined() {
return declined;
public boolean isActive() {
return active;
}
public void decline() {
declined = true;
public void deactivate() {
this.active = false;
}
}

3
src/main/java/com/artillexstudios/axtrade/request/Requests.java
View File

@ -63,9 +63,10 @@ public class Requests {
if (!request.getSender().equals(sender)) {
Trades.addTrade(sender, receiver);
requests.remove(request);
request.deactivate();
return;
}
if (request.isDeclined() || System.currentTimeMillis() - request.getTime() < CONFIG.getInt("trade-request-expire-seconds", 60) * 1_000L) {
if (!request.isActive() || System.currentTimeMillis() - request.getTime() < CONFIG.getInt("trade-request-expire-seconds", 60) * 1_000L) {
MESSAGEUTILS.sendLang(sender, "request.already-sent", replacements);
return;
}

4
src/main/java/com/artillexstudios/axtrade/trade/GuiFrame.java
View File

@ -56,8 +56,8 @@ public class GuiFrame {
final Pair<String, String> otherTextures = NMSHandlers.getNmsHandler().textures(trade.getOtherPlayer(player.getPlayer()));
final HashMap<String, String> map = new HashMap<>(Map.of(
"%own-head%", selfTextures == null ? "" : selfTextures.getFirst(),
"%partner-head%", otherTextures == null ? "" : otherTextures.getFirst()
"%own-head%", selfTextures == null ? "" : selfTextures.getKey(),
"%partner-head%", otherTextures == null ? "" : otherTextures.getKey()
));
map.putAll(replacements);

2
src/main/resources/lang.yml
View File

@ -57,7 +57,7 @@ request:
deny-receiver: "&#CCFFEEYou have successfully denied &#00FFDD%player%&#CCFFEE's trade request!"
cant-trade-self: "&#CCFFEEYou can't send a trade request to yourself!"
already-in-trade: "&#CCFFEEThe player is already trading with someone!"
already-sent: "&#CCFFEEYou have already sent a trade request to &#00FFDD%player%&#CCFFEE!"
already-sent: "&#CCFFEEYou have already sent a trade request to &#00FFDD%player% &#CCFFEErecently!"
too-far: "&#CCFFEEYou are too far from &#00FFDD%player% &#CCFFEEto send a trade request!"
not-accepting: "&#CCFFEEThis player is not accepting trades right now!"
disallowed-gamemode: "&#CCFFEEEither you or the other player is in a disallowed gamemode!"