diff --git a/forge16/src/main/java/com/envyful/auras/config/EnvyAurasLocale.java b/forge16/src/main/java/com/envyful/auras/config/EnvyAurasLocale.java index e498e2c..2dd62c1 100644 --- a/forge16/src/main/java/com/envyful/auras/config/EnvyAurasLocale.java +++ b/forge16/src/main/java/com/envyful/auras/config/EnvyAurasLocale.java @@ -15,6 +15,8 @@ public class EnvyAurasLocale extends AbstractYamlConfig { private List givenAura = Lists.newArrayList("&e&l(!) &eYou have given %player% %amount% x %aura%"); private List cancelOverwrite = Lists.newArrayList("&c&l(!) &cYou cancelled the aura overwrite"); private List overwritten = Lists.newArrayList("&e&l(!) &eYou overwrote the %old_aura% to %new_aura% for %pokemon%"); + private List auraSet = Lists.newArrayList("&e&l(!) &eYou set %pokemon%'s aura to %aura%"); + private List cannotSetOthersAuras = Lists.newArrayList("&c&l(!) &cYou cannot set the aura for other players' Pokemon!"); public EnvyAurasLocale() { super(); @@ -35,4 +37,12 @@ public List getCancelOverwrite() { public List getOverwritten() { return this.overwritten; } + + public List getAuraSet() { + return this.auraSet; + } + + public List getCannotSetOthersAuras() { + return this.cannotSetOthersAuras; + } } diff --git a/forge16/src/main/java/com/envyful/auras/listener/PlayerInteractListener.java b/forge16/src/main/java/com/envyful/auras/listener/PlayerInteractListener.java index 8ce54bc..3a8a4ac 100644 --- a/forge16/src/main/java/com/envyful/auras/listener/PlayerInteractListener.java +++ b/forge16/src/main/java/com/envyful/auras/listener/PlayerInteractListener.java @@ -1,5 +1,7 @@ package com.envyful.auras.listener; +import com.envyful.api.platform.PlatformProxy; +import com.envyful.api.text.Placeholder; import com.envyful.auras.EnvyAuras; import com.pixelmonmod.pixelmon.entities.pixelmon.PixelmonEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -27,19 +29,20 @@ public void onEntityInteract(PlayerInteractEvent.EntityInteractSpecific event) { event.setCanceled(true); if (!pixelmon.isOwnedBy(player)) { - //TODO: error + bypass logic + PlatformProxy.sendMessage(player, EnvyAuras.getLocale().getCannotSetOthersAuras()); return; } if (pixelmon.getPokemon().getPersistentData().contains("ENVY_AURAS")) { itemInHand.shrink(1); - var pokemonAura = EnvyAuras.getConfig().auraFromPokemon(pixelmon); EnvyAuras.getGraphics().getOverwriteWarningUI().open(EnvyAuras.getPlayerManager().getPlayer(player), aura, pixelmon); return; } pixelmon.getPokemon().getPersistentData().putString("ENVY_AURAS", aura.id()); - //TODO: success message + PlatformProxy.sendMessage(player, EnvyAuras.getLocale().getAuraSet(), + Placeholder.simple("%aura%", aura.displayName()), + Placeholder.simple("%pokemon%", pixelmon.getDisplayName().getString())); itemInHand.shrink(1); }