Skip to content

Commit

Permalink
feat(type): add sprite config placeholder support
Browse files Browse the repository at this point in the history
  • Loading branch information
@danorris709
danorris709 committed Aug 2, 2023
1 parent 7cf6b34 commit 9a22660
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 9 deletions.
6 changes: 4 additions & 2 deletions ...n/java/com/envyful/better/poke/broadcaster/api/type/impl/type/CaptureBroadcasterType.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.envyful.better.poke.broadcaster.api.type.impl.type;

import com.envyful.api.forge.world.UtilWorld;
import com.envyful.api.reforged.pixelmon.sprite.UtilSprite;
import com.envyful.better.poke.broadcaster.BetterPokeBroadcaster;
import com.envyful.better.poke.broadcaster.api.type.impl.AbstractBroadcasterType;
import com.envyful.better.poke.broadcaster.api.util.BroadcasterUtil;
import com.pixelmonmod.pixelmon.api.events.CaptureEvent;
Expand All @@ -27,13 +29,13 @@ protected PixelmonEntity getEntity(CaptureEvent.SuccessfulCapture event) {

@Override
protected String translateEventMessage(CaptureEvent.SuccessfulCapture event, String line, PixelmonEntity pixelmon, ServerPlayerEntity nearestPlayer) {
return line.replace("%player%", nearestPlayer.getName().getString())
return UtilSprite.replacePokemonPlaceholders(line.replace("%player%", nearestPlayer.getName().getString())
.replace("%x%", pixelmon.getX() + "")
.replace("%y%", pixelmon.getY() + "")
.replace("%z%", pixelmon.getZ() + "")
.replace("%world%", UtilWorld.getName(pixelmon.level) + "")
.replace("%pokemon%", pixelmon.getPokemonName())
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString());
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString()), pixelmon.getPokemon(), BetterPokeBroadcaster.getInstance().getConfig().getPlaceholderFormat());
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...in/java/com/envyful/better/poke/broadcaster/api/type/impl/type/DefeatBroadcasterType.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.envyful.better.poke.broadcaster.api.type.impl.type;

import com.envyful.api.forge.world.UtilWorld;
import com.envyful.api.reforged.pixelmon.sprite.UtilSprite;
import com.envyful.better.poke.broadcaster.BetterPokeBroadcaster;
import com.envyful.better.poke.broadcaster.api.type.impl.AbstractBroadcasterType;
import com.envyful.better.poke.broadcaster.api.util.BroadcasterUtil;
import com.pixelmonmod.pixelmon.api.battles.BattleEndCause;
Expand Down Expand Up @@ -67,13 +69,13 @@ protected PixelmonEntity getEntity(BattleEndEvent event) {

@Override
protected String translateEventMessage(BattleEndEvent event, String line, PixelmonEntity pixelmon, ServerPlayerEntity nearestPlayer) {
return line.replace("%nearest_name%", nearestPlayer == null ? "None" : nearestPlayer.getName().getString())
return UtilSprite.replacePokemonPlaceholders(line.replace("%nearest_name%", nearestPlayer == null ? "None" : nearestPlayer.getName().getString())
.replace("%x%", pixelmon.getX() + "")
.replace("%y%", pixelmon.getY() + "")
.replace("%z%", pixelmon.getZ() + "")
.replace("%world%", UtilWorld.getName(pixelmon.level) + "")
.replace("%pokemon%", pixelmon.getPokemonName())
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString());
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString()), pixelmon.getPokemon(), BetterPokeBroadcaster.getInstance().getConfig().getPlaceholderFormat());
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...main/java/com/envyful/better/poke/broadcaster/api/type/impl/type/FleeBroadcasterType.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.envyful.better.poke.broadcaster.api.type.impl.type;

import com.envyful.api.forge.world.UtilWorld;
import com.envyful.api.reforged.pixelmon.sprite.UtilSprite;
import com.envyful.better.poke.broadcaster.BetterPokeBroadcaster;
import com.envyful.better.poke.broadcaster.api.type.impl.AbstractBroadcasterType;
import com.envyful.better.poke.broadcaster.api.util.BroadcasterUtil;
import com.pixelmonmod.pixelmon.api.battles.BattleEndCause;
Expand Down Expand Up @@ -63,13 +65,13 @@ protected PixelmonEntity getEntity(BattleEndEvent event) {

@Override
protected String translateEventMessage(BattleEndEvent event, String line, PixelmonEntity pixelmon, ServerPlayerEntity nearestPlayer) {
return line.replace("%nearest_name%", nearestPlayer == null ? "None" : nearestPlayer.getName().getString())
return UtilSprite.replacePokemonPlaceholders(line.replace("%nearest_name%", nearestPlayer == null ? "None" : nearestPlayer.getName().getString())
.replace("%x%", pixelmon.getX() + "")
.replace("%y%", pixelmon.getY() + "")
.replace("%z%", pixelmon.getZ() + "")
.replace("%world%", UtilWorld.getName(pixelmon.level) + "")
.replace("%pokemon%", pixelmon.getPokemonName())
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString());
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString()), pixelmon.getPokemon(), BetterPokeBroadcaster.getInstance().getConfig().getPlaceholderFormat());
}

@Override
Expand Down
7 changes: 5 additions & 2 deletions ...ain/java/com/envyful/better/poke/broadcaster/api/type/impl/type/SpawnBroadcasterType.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.envyful.better.poke.broadcaster.api.type.impl.type;

import com.envyful.api.forge.world.UtilWorld;
import com.envyful.api.reforged.pixelmon.sprite.UtilSprite;
import com.envyful.better.poke.broadcaster.BetterPokeBroadcaster;
import com.envyful.better.poke.broadcaster.api.type.impl.AbstractBroadcasterType;
import com.envyful.better.poke.broadcaster.api.util.BroadcasterUtil;
import com.pixelmonmod.pixelmon.api.events.spawning.SpawnEvent;
Expand Down Expand Up @@ -41,13 +43,14 @@ protected PixelmonEntity getEntity(SpawnEvent spawnEvent) {

@Override
protected String translateEventMessage(SpawnEvent spawnEvent, String line, PixelmonEntity pixelmon, ServerPlayerEntity nearestPlayer) {
return line.replace("%nearest_name%", nearestPlayer == null ? "None" : nearestPlayer.getName().getString())
return UtilSprite.replacePokemonPlaceholders(line.replace("%nearest_name%", nearestPlayer == null ? "None" : nearestPlayer.getName().getString())
.replace("%x%", pixelmon.getX() + "")
.replace("%y%", pixelmon.getY() + "")
.replace("%z%", pixelmon.getZ() + "")
.replace("%world%", UtilWorld.getName(pixelmon.level) + "")
.replace("%pokemon%", pixelmon.getPokemonName())
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString());
.replace("%biome%", BiomeHelper.getLocalizedBiomeName(pixelmon.level.getBiome(pixelmon.blockPosition())).getString()),
pixelmon.getPokemon(), BetterPokeBroadcaster.getInstance().getConfig().getPlaceholderFormat());
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion ...src/main/java/com/envyful/better/poke/broadcaster/config/BetterPokeBroadcasterConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.envyful.api.reforged.pixelmon.UtilPokemonInfo;
import com.envyful.api.reforged.pixelmon.config.SpriteConfig;
import com.envyful.api.reforged.pixelmon.sprite.UtilSprite;
import com.envyful.better.poke.broadcaster.BetterPokeBroadcaster;
import com.envyful.better.poke.broadcaster.api.type.BroadcasterType;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
Expand Down Expand Up @@ -45,6 +46,8 @@ public class BetterPokeBroadcasterConfig extends AbstractYamlConfig {
)
);

private SpriteConfig placeholderFormat = new SpriteConfig();

public BetterPokeBroadcasterConfig() {
super();
}
Expand All @@ -53,6 +56,10 @@ public List<BroadcastOption> getOptions() {
return Lists.newArrayList(broadcastOptions.values());
}

public SpriteConfig getPlaceholderFormat() {
return this.placeholderFormat;
}

@ConfigSerializable
public static class BroadcastOption {

Expand Down Expand Up @@ -109,7 +116,7 @@ public boolean isNearestPlayerOnly() {
public DiscordWebHook getWebHook(Event event, ServerPlayerEntity nearestPlayer, BroadcasterType<?> type, PixelmonEntity pixelmon) {
if (this.readFile == null) {
try {
this.readFile = UtilSprite.replacePokemonPlaceholders(String.join(System.lineSeparator(), Files.readAllLines(Paths.get(this.webhook), StandardCharsets.UTF_8)), pixelmon.getPokemon(), new SpriteConfig());
this.readFile = UtilSprite.replacePokemonPlaceholders(String.join(System.lineSeparator(), Files.readAllLines(Paths.get(this.webhook), StandardCharsets.UTF_8)), pixelmon.getPokemon(), BetterPokeBroadcaster.getInstance().getConfig().getPlaceholderFormat());
} catch (IOException e) {
e.printStackTrace();
}
Expand Down

0 comments on commit 9a22660

Please sign in to comment.