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

1.3.0

Browse Source
This commit is contained in:
BenceX100 2024-05-26 15:19:31 +02:00
parent 727806f690
commit 298bfb1c38
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.artillexstudios</groupId> <groupId>com.artillexstudios</groupId>
<artifactId>AxTrade</artifactId> <artifactId>AxTrade</artifactId>
<version>1.2.0</version> <version>1.3.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>AxTrade</name> <name>AxTrade</name>

13
src/main/java/com/artillexstudios/axtrade/trade/TradeGui.java
View File

@ -16,6 +16,7 @@ import dev.triumphteam.gui.guis.StorageGui;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -120,9 +121,15 @@ public class TradeGui extends GuiFrame {
return; return;
} }
if (event.isShiftClick() && !slots.contains(event.getView().getTopInventory().firstEmpty())) { if (event.getCurrentItem() != null && event.isShiftClick() && event.getAction() == InventoryAction.MOVE_TO_OTHER_INVENTORY && !slots.contains(event.getView().getTopInventory().firstEmpty())) {
event.setCancelled(true); event.setCancelled(true);
return; for (int i : slots) {
if (gui.getInventory().getItem(i) == null) {
gui.getInventory().setItem(i, event.getCurrentItem().clone());
event.getCurrentItem().setAmount(0);
break;
}
}
} }
player.cancel(); player.cancel();
@ -230,8 +237,6 @@ public class TradeGui extends GuiFrame {
gui.updateItem(slot, new GuiItem(otherItems.get(n), event -> event.setCancelled(true))); gui.updateItem(slot, new GuiItem(otherItems.get(n), event -> event.setCancelled(true)));
n++; n++;
} }
updateTitle();
} }
public List<ItemStack> getItems() { public List<ItemStack> getItems() {

16
src/main/java/com/artillexstudios/axtrade/trade/TradePlayer.java
View File

@ -7,6 +7,7 @@ import com.artillexstudios.axtrade.utils.SoundUtils;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.HashMap; import java.util.HashMap;
import java.util.Objects;
import static com.artillexstudios.axtrade.AxTrade.CONFIG; import static com.artillexstudios.axtrade.AxTrade.CONFIG;
@ -57,19 +58,30 @@ public class TradePlayer {
trade.update(); trade.update();
SoundUtils.playSound(player, "accept"); SoundUtils.playSound(player, "accept");
SoundUtils.playSound(otherPlayer.getPlayer(), "accept"); SoundUtils.playSound(otherPlayer.getPlayer(), "accept");
getTradeGui().updateTitle();
otherPlayer.getTradeGui().updateTitle();
} }
public void cancel() { public void cancel() {
if (confirmed != null) { if (confirmed != null) {
this.confirmed = null; this.confirmed = null;
otherPlayer.setConfirmed(null);
SoundUtils.playSound(player, "cancel"); SoundUtils.playSound(player, "cancel");
SoundUtils.playSound(otherPlayer.getPlayer(), "cancel"); SoundUtils.playSound(otherPlayer.getPlayer(), "cancel");
getTradeGui().updateTitle();
otherPlayer.getTradeGui().updateTitle();
return;
} }
otherPlayer.setConfirmed(null); if (otherPlayer.setConfirmed(null)) getTradeGui().updateTitle();
} }
public void setConfirmed(Integer confirmed) { public boolean setConfirmed(Integer confirmed) {
if (Objects.equals(this.confirmed, confirmed)) return false;
this.confirmed = confirmed; this.confirmed = confirmed;
getTradeGui().updateTitle();
return true;
} }
public void tick() { public void tick() {