diff --git a/build.gradle b/build.gradle index e834f7e..1a2c337 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ subprojects { apply plugin: 'maven-publish' group = 'com.envyful.gts' - version = '5.1.0' + version = '5.2.0' ext { forgeVersion = "none" diff --git a/neo21/build.gradle b/neo21/build.gradle index eea4d33..127a2b2 100644 --- a/neo21/build.gradle +++ b/neo21/build.gradle @@ -16,14 +16,14 @@ sourceSets.main.resources { srcDir 'src/generated/resources' } repositories {} dependencies { - implementation "pixelmon:Pixelmon-1.21.1-9.3.2-universal:9.3.2" - interfaceInjectionData("pixelmon:Pixelmon-1.21.1-9.3.2-universal-interfaceinjection:9.3.2@json") + implementation "pixelmon:Pixelmon-1.21.1-9.3.5-universal:9.3.5" + interfaceInjectionData("pixelmon:Pixelmon-1.21.1-9.3.5-universal-interfaceinjection:9.3.5@json") implementation "com.envyful.papi:api:2.1.0" shadow group: 'org.spongepowered', name: 'configurate-yaml', version: '4.2.0-COMMENTS' - var apiVersion = "8.0.9-t1" + var apiVersion = "8.1.8" shadow (group: 'com.envyful.api', name: 'commons', version: apiVersion) shadow (group: 'com.envyful.api', name: 'neo21', version: apiVersion) { transitive = false diff --git a/neo21/src/main/java/com/envyful/gts/forge/EnvyGTSForge.java b/neo21/src/main/java/com/envyful/gts/forge/EnvyGTSForge.java index 9493669..c47d421 100644 --- a/neo21/src/main/java/com/envyful/gts/forge/EnvyGTSForge.java +++ b/neo21/src/main/java/com/envyful/gts/forge/EnvyGTSForge.java @@ -15,6 +15,7 @@ import com.envyful.api.neoforge.platform.ForgePlatformHandler; import com.envyful.api.neoforge.player.ForgeEnvyPlayer; import com.envyful.api.neoforge.player.ForgePlayerManager; +import com.envyful.api.neoforge.player.util.UtilPlayer; import com.envyful.api.platform.PlatformProxy; import com.envyful.api.player.Attribute; import com.envyful.api.sqlite.config.SQLiteDatabaseDetailsConfig; @@ -127,6 +128,7 @@ public void loadConfig() { @SubscribeEvent public void onServerStarting(RegisterCommandsEvent event) { + UtilPlayer.registerPermission("envygts.admin"); this.commandFactory.registerCommand(event.getDispatcher(), this.commandFactory.parseCommand(new GTSCommand())); } diff --git a/neo21/src/main/java/com/envyful/gts/forge/impl/trade/ForgeTrade.java b/neo21/src/main/java/com/envyful/gts/forge/impl/trade/ForgeTrade.java index 389cef7..790930e 100644 --- a/neo21/src/main/java/com/envyful/gts/forge/impl/trade/ForgeTrade.java +++ b/neo21/src/main/java/com/envyful/gts/forge/impl/trade/ForgeTrade.java @@ -1,5 +1,6 @@ package com.envyful.gts.forge.impl.trade; +import com.envyful.api.concurrency.UtilConcurrency; import com.envyful.api.neoforge.chat.UtilChatColour; import com.envyful.api.neoforge.player.ForgeEnvyPlayer; import com.envyful.api.player.EnvyPlayer; diff --git a/neo21/src/main/java/com/envyful/gts/forge/impl/trade/type/ItemTrade.java b/neo21/src/main/java/com/envyful/gts/forge/impl/trade/type/ItemTrade.java index c8d3ec0..ce3e4a6 100644 --- a/neo21/src/main/java/com/envyful/gts/forge/impl/trade/type/ItemTrade.java +++ b/neo21/src/main/java/com/envyful/gts/forge/impl/trade/type/ItemTrade.java @@ -69,11 +69,7 @@ public CompletableFuture collect(EnvyPlayer player, Consumer collect(EnvyPlayer player, Consumer collect(EnvyPlayer player, Consumer> returnGui, Pane pa .asyncClick(false) .singleClick() .clickHandler((envyPlayer, clickType) -> { - GTSAttribute attribute = ((ForgeEnvyPlayer) envyPlayer).getAttributeNow(GTSAttribute.class); + GTSAttribute attribute = envyPlayer.getAttributeNow(GTSAttribute.class); attribute.getOwnedTrades().remove(this); + UtilConcurrency.runAsync(this::delete); this.collect(envyPlayer, returnGui); }) .build()); diff --git a/neo21/src/main/java/com/envyful/gts/forge/ui/EditDurationUI.java b/neo21/src/main/java/com/envyful/gts/forge/ui/EditDurationUI.java index 6d5d628..2a9470f 100644 --- a/neo21/src/main/java/com/envyful/gts/forge/ui/EditDurationUI.java +++ b/neo21/src/main/java/com/envyful/gts/forge/ui/EditDurationUI.java @@ -40,7 +40,7 @@ public static void openUI(ForgeEnvyPlayer player, int page, int position, boolea .replace("%max_duration%", UtilTimeFormat.getFormattedDuration( TimeUnit.SECONDS.toMillis(EnvyGTSForge.getConfig().getMinTradeDuration()) )) - .replace("%pokemon%", pokemon.getDisplayName().getString()))) + .replace("%pokemonItem%", pokemon.getDisplayName().getString()))) .defaultText(TimeUnit.SECONDS.toMinutes(EnvyGTSForge.getConfig().getMinTradeDuration()) + "m") .maxInputLength(10) .closeOnEscape() @@ -96,6 +96,7 @@ public static void openUI(ForgeEnvyPlayer player, int page, int position, boolea attribute.setCurrentMinPrice(0); attribute.setCurrentPrice(0); attribute.setSelectedSlot(-1); + PlatformProxy.runSync(player.getParent()::closeContainer); }); }) .build() diff --git a/neo21/src/main/java/com/envyful/gts/forge/ui/EditItemDurationUI.java b/neo21/src/main/java/com/envyful/gts/forge/ui/EditItemDurationUI.java index b1487d3..8076120 100644 --- a/neo21/src/main/java/com/envyful/gts/forge/ui/EditItemDurationUI.java +++ b/neo21/src/main/java/com/envyful/gts/forge/ui/EditItemDurationUI.java @@ -4,6 +4,7 @@ import com.envyful.api.neoforge.concurrency.UtilForgeConcurrency; import com.envyful.api.neoforge.player.ForgeEnvyPlayer; import com.envyful.api.neoforge.player.util.UtilPlayer; +import com.envyful.api.platform.PlatformProxy; import com.envyful.api.time.UtilTime; import com.envyful.api.time.UtilTimeFormat; import com.envyful.gts.forge.EnvyGTSForge; @@ -34,11 +35,10 @@ public static void openUI(ForgeEnvyPlayer player, double time, boolean error) { .replace("%max_duration%", UtilTimeFormat.getFormattedDuration( TimeUnit.SECONDS.toMillis(EnvyGTSForge.getConfig().getMinTradeDuration()) )) - .replace("%item%", itemInHand.getHoverName().getString()))) + .replace("%pokemonItem%", itemInHand.getHoverName().getString()))) .showInput() .defaultText(TimeUnit.SECONDS.toMinutes(EnvyGTSForge.getConfig().getMinTradeDuration()) + "m") .closeOnEscape() - .onClose(closedScreen -> SellHandOrParty.open(player)) .buttons(DialogueButton.builder() .text("Submit") .onClick(submitted -> { @@ -55,6 +55,7 @@ public static void openUI(ForgeEnvyPlayer player, double time, boolean error) { } UtilPlayer.runCommand(player.getParent(), "gts sell " + itemInHand.getCount() + " " + time + " " + submitted.getInput()); + PlatformProxy.runSync(player.getParent()::closeContainer); }) .build()) .sendTo(player.getParent()), 5); diff --git a/neo21/src/main/java/com/envyful/gts/forge/ui/SelectPartyPokemonUI.java b/neo21/src/main/java/com/envyful/gts/forge/ui/SelectPartyPokemonUI.java index 1ab2057..4b540dd 100644 --- a/neo21/src/main/java/com/envyful/gts/forge/ui/SelectPartyPokemonUI.java +++ b/neo21/src/main/java/com/envyful/gts/forge/ui/SelectPartyPokemonUI.java @@ -114,8 +114,6 @@ private static void setPokemon(ForgeEnvyPlayer player, Pane pane) { item.enchant(enchants.getHolder(Enchantments.MENDING).orElseThrow(), 1); } - player.getParent().getInventory().add(item.copy()); - pane.set(pos % 9, pos / 9, GuiFactory.displayableBuilder(ItemStack.class) .itemStack(item) .clickHandler((envyPlayer, clickType) -> {