diff --git a/build.gradle.kts b/build.gradle.kts index 9dff019..548fc11 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "com.rsscripting" -version = "1.0.4" +version = "1.1.0" val pluginVersion = version.toString() repositories { diff --git a/docs/Supported-Mobs.md b/docs/Supported-Mobs.md index 5c3e273..2861f26 100644 --- a/docs/Supported-Mobs.md +++ b/docs/Supported-Mobs.md @@ -19,6 +19,7 @@ RS-MobCages supports the following mobs: - Cow - Chicken - Donkey +- Frog - Horse - Parrot - Pig diff --git a/src/main/java/com/rsscripting/mobcage/description/descriptor/FrogDescriptor.java b/src/main/java/com/rsscripting/mobcage/description/descriptor/FrogDescriptor.java new file mode 100644 index 0000000..f7b85a6 --- /dev/null +++ b/src/main/java/com/rsscripting/mobcage/description/descriptor/FrogDescriptor.java @@ -0,0 +1,107 @@ +package com.rsscripting.mobcage.description.descriptor; + +import com.rsscripting.mobcage.description.CaptureResult; +import com.rsscripting.mobcage.description.MobAttribute; +import com.rsscripting.mobcage.description.MobDescriptionFormatter; +import com.rsscripting.mobcage.util.MobAgeUtil; +import com.rsscripting.mobcage.util.MobHealthUtil; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import org.bukkit.Location; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Frog; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; + +import java.util.List; + +public class FrogDescriptor implements MobDescriptor { + + @Override + public boolean supports(LivingEntity entity) { + return entity instanceof Frog; + } + + @Override + public CaptureResult beforeCapture(LivingEntity entity, Player player) { + + CaptureResult result = MobHealthUtil.validateFullHealth(entity); + + if (!result.isAllowed()) { + return result; + } + + MobAgeUtil.normalize(entity); + + return CaptureResult.allowed(); + } + + @Override + public String getDisplayName(LivingEntity entity) { + return MobAgeUtil.getAgePrefix(entity) + "Frog"; + } + + @Override + public List getAttributes(LivingEntity entity) { + + Frog frog = (Frog) entity; + + return List.of( + new MobAttribute( + "Variant", + MobDescriptionFormatter.formatEnumName( + frog.getVariant().getKey().getKey() + ) + ) + ); + } + + @Override + public void release(Location location, List lore) { + + PlainTextComponentSerializer plain = + PlainTextComponentSerializer.plainText(); + + boolean baby = false; + Frog.Variant variant = Frog.Variant.TEMPERATE; + + for (int i = 0; i < lore.size(); i++) { + + String line = plain.serialize(lore.get(i)); + + if (line.equals("Contains:") && i + 1 < lore.size()) { + baby = plain.serialize(lore.get(i + 1)) + .equals("Baby Frog"); + } + + if (line.equals("Variant:") && i + 1 < lore.size()) { + variant = getVariant( + plain.serialize(lore.get(i + 1)) + ); + } + } + + Frog frog = (Frog) location.getWorld().spawnEntity( + location, + EntityType.FROG + ); + + if (baby) { + frog.setBaby(); + } else { + frog.setAdult(); + } + + frog.setVariant(variant); + } + + private Frog.Variant getVariant(String value) { + + return switch (value) { + case "Cold" -> Frog.Variant.COLD; + case "Temperate" -> Frog.Variant.TEMPERATE; + case "Warm" -> Frog.Variant.WARM; + default -> Frog.Variant.TEMPERATE; + }; + } +} \ No newline at end of file diff --git a/src/main/java/com/rsscripting/mobcage/description/descriptor/MobDescriptorRegistry.java b/src/main/java/com/rsscripting/mobcage/description/descriptor/MobDescriptorRegistry.java index 456727c..f380178 100644 --- a/src/main/java/com/rsscripting/mobcage/description/descriptor/MobDescriptorRegistry.java +++ b/src/main/java/com/rsscripting/mobcage/description/descriptor/MobDescriptorRegistry.java @@ -14,6 +14,7 @@ public final class MobDescriptorRegistry { new ChickenDescriptor(), new CowDescriptor(), new DonkeyDescriptor(), + new FrogDescriptor(), new HorseDescriptor(), new ParrotDescriptor(), new PigDescriptor(), diff --git a/src/main/java/com/rsscripting/mobcage/listener/MobReleaseListener.java b/src/main/java/com/rsscripting/mobcage/listener/MobReleaseListener.java index 30477fe..de927c6 100644 --- a/src/main/java/com/rsscripting/mobcage/listener/MobReleaseListener.java +++ b/src/main/java/com/rsscripting/mobcage/listener/MobReleaseListener.java @@ -82,6 +82,9 @@ public class MobReleaseListener implements Listener { case "Donkey", "Baby Donkey" -> new DonkeyDescriptor().release(location, lore); + case "Frog", "Baby Frog" -> + new FrogDescriptor().release(location, lore); + case "Horse", "Baby Horse" -> new HorseDescriptor().release(location, lore);