mirror of
https://github.com/Artillex-Studios/AxTrade.git
synced 2025-01-07 19:17:53 +01:00
1.2.0
This commit is contained in:
parent
f66d9edad3
commit
727806f690
4
pom.xml
4
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>com.artillexstudios</groupId>
|
<groupId>com.artillexstudios</groupId>
|
||||||
<artifactId>AxTrade</artifactId>
|
<artifactId>AxTrade</artifactId>
|
||||||
<version>1.1.1</version>
|
<version>1.2.0</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>AxTrade</name>
|
<name>AxTrade</name>
|
||||||
@ -112,7 +112,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.artillexstudios.axapi</groupId>
|
<groupId>com.artillexstudios.axapi</groupId>
|
||||||
<artifactId>axapi</artifactId>
|
<artifactId>axapi</artifactId>
|
||||||
<version>1.4.234</version>
|
<version>1.4.236</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<classifier>all</classifier>
|
<classifier>all</classifier>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.artillexstudios.axtrade.trade;
|
package com.artillexstudios.axtrade.trade;
|
||||||
|
|
||||||
import com.artillexstudios.axapi.gui.SignInput;
|
import com.artillexstudios.axapi.gui.SignInput;
|
||||||
|
import com.artillexstudios.axapi.nms.NMSHandlers;
|
||||||
import com.artillexstudios.axapi.scheduler.ScheduledTask;
|
import com.artillexstudios.axapi.scheduler.ScheduledTask;
|
||||||
import com.artillexstudios.axapi.scheduler.Scheduler;
|
import com.artillexstudios.axapi.scheduler.Scheduler;
|
||||||
import com.artillexstudios.axapi.utils.StringUtils;
|
import com.artillexstudios.axapi.utils.StringUtils;
|
||||||
@ -15,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.inventory.Inventory;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
@ -42,7 +44,7 @@ public class TradeGui extends GuiFrame {
|
|||||||
this.player = player;
|
this.player = player;
|
||||||
this.gui = Gui.storage()
|
this.gui = Gui.storage()
|
||||||
.rows(GUIS.getInt("rows",6))
|
.rows(GUIS.getInt("rows",6))
|
||||||
.title(StringUtils.format(GUIS.getString("title").replace("%player%", player.getOtherPlayer().getPlayer().getName())))
|
.title(Component.empty())
|
||||||
.disableItemDrop()
|
.disableItemDrop()
|
||||||
.create();
|
.create();
|
||||||
setGui(gui);
|
setGui(gui);
|
||||||
@ -134,6 +136,7 @@ public class TradeGui extends GuiFrame {
|
|||||||
|
|
||||||
update();
|
update();
|
||||||
gui.open(player.getPlayer());
|
gui.open(player.getPlayer());
|
||||||
|
updateTitle();
|
||||||
opened = true;
|
opened = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -227,6 +230,8 @@ 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() {
|
||||||
@ -236,4 +241,18 @@ public class TradeGui extends GuiFrame {
|
|||||||
}
|
}
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void updateTitle() {
|
||||||
|
Component title = StringUtils.format(
|
||||||
|
GUIS.getString("title")
|
||||||
|
.replace("%player%", player.getOtherPlayer().getPlayer().getName())
|
||||||
|
.replace("%own-status%", player.hasConfirmed() ? LANG.getString("placeholders.ready") : LANG.getString("placeholders.waiting"))
|
||||||
|
.replace("%partner-status%", player.getOtherPlayer().hasConfirmed() ? LANG.getString("placeholders.ready") : LANG.getString("placeholders.waiting"))
|
||||||
|
);
|
||||||
|
|
||||||
|
final Inventory topInv = player.getPlayer().getOpenInventory().getTopInventory();
|
||||||
|
if (topInv.equals(gui.getInventory())) {
|
||||||
|
NMSHandlers.getNmsHandler().setTitle(player.getPlayer().getOpenInventory().getTopInventory(), title);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -80,5 +80,10 @@ sounds:
|
|||||||
countdown: "ui.button.click"
|
countdown: "ui.button.click"
|
||||||
cancel: "ui.button.click"
|
cancel: "ui.button.click"
|
||||||
|
|
||||||
|
# can be used in the gui title as %own-status% and %partner-status%
|
||||||
|
placeholders:
|
||||||
|
ready: "Ready"
|
||||||
|
waiting: "Waiting"
|
||||||
|
|
||||||
# do not change this
|
# do not change this
|
||||||
version: 1
|
version: 2
|
Loading…
Reference in New Issue
Block a user