YouHaveTrouble/Entiddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Merge pull request #1 from YouHaveTrouble/dev

Browse Source 
2.0.0
This commit is contained in:
YouHaveTrouble
2022-05-28 11:20:25 +02:00
committed by GitHub
parent b89e332ed4 2e0b137666
commit 75457eca4b
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>me.youhavetrouble</groupId> <groupId>me.youhavetrouble</groupId>
<artifactId>Entiddy</artifactId> <artifactId>Entiddy</artifactId>
<version>1.2.0</version> <version>2.0.0-pre</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Entiddy</name> <name>Entiddy</name>
src/main/java/me/youhavetrouble/entiddy/Entiddy.java
+2 -1
View File
@@ -5,6 +5,7 @@ import me.youhavetrouble.entiddy.SpecialEntities.JebSheep;
import me.youhavetrouble.entiddy.SpecialEntities.Johnny; import me.youhavetrouble.entiddy.SpecialEntities.Johnny;
import me.youhavetrouble.entiddy.SpecialEntities.KillerBunny; import me.youhavetrouble.entiddy.SpecialEntities.KillerBunny;
import me.youhavetrouble.entiddy.SpecialEntities.Toast; import me.youhavetrouble.entiddy.SpecialEntities.Toast;
import net.kyori.adventure.text.Component;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -57,7 +58,7 @@ public enum Entiddy {
*/ */
public static void upsideDown(@NotNull LivingEntity entity) { public static void upsideDown(@NotNull LivingEntity entity) {
if (entity instanceof Player) return; if (entity instanceof Player) return;
entity.setCustomName("Grumm"); entity.customName(Component.text("Grumm"));
} }
/** /**
src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java
+10 -7
View File
@@ -1,14 +1,14 @@
package me.youhavetrouble.entiddy.SpecialEntities; package me.youhavetrouble.entiddy.SpecialEntities;
import me.youhavetrouble.entiddy.EntiddyInterface; import me.youhavetrouble.entiddy.EntiddyInterface;
import net.kyori.adventure.text.Component;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Entity; import org.bukkit.entity.*;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Rabbit;
import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class JebSheep implements EntiddyInterface { public class JebSheep implements EntiddyInterface {
@Override @Override
@@ -16,12 +16,15 @@ public class JebSheep implements EntiddyInterface {
if (location.getWorld() == null) { if (location.getWorld() == null) {
throw new NullPointerException("World cannot be null"); throw new NullPointerException("World cannot be null");
} }
return location.getWorld().spawnEntity(location, EntityType.SHEEP, spawnReason, (entity) -> entity.setCustomName("jeb_")); return location.getWorld().spawnEntity(location, EntityType.SHEEP, spawnReason, (entity) -> {
entity.customName(Component.text("jeb_"));
entity.setCustomNameVisible(false);
});
} }
@Override @Override
public boolean isInstance(@NotNull LivingEntity entity) { public boolean isInstance(@NotNull LivingEntity entity) {
if (!(entity instanceof Rabbit)) return false; if (!(entity instanceof Sheep)) return false;
return entity.getCustomName() != null && entity.getCustomName().equals("jeb_"); return Objects.equals(entity.customName(), Component.text("jeb_"));
} }
} }
src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java
+9 -2
View File
@@ -1,6 +1,7 @@
package me.youhavetrouble.entiddy.SpecialEntities; package me.youhavetrouble.entiddy.SpecialEntities;
import me.youhavetrouble.entiddy.EntiddyInterface; import me.youhavetrouble.entiddy.EntiddyInterface;
import net.kyori.adventure.text.Component;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@@ -9,6 +10,8 @@ import org.bukkit.entity.Rabbit;
import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Objects;
public class Toast implements EntiddyInterface { public class Toast implements EntiddyInterface {
@Override @Override
@@ -16,12 +19,16 @@ public class Toast implements EntiddyInterface {
if (location.getWorld() == null) { if (location.getWorld() == null) {
throw new NullPointerException("World cannot be null"); throw new NullPointerException("World cannot be null");
} }
return location.getWorld().spawnEntity(location, EntityType.RABBIT, spawnReason, (entity) -> entity.setCustomName("Toast")); return location.getWorld().spawnEntity(location, EntityType.RABBIT, spawnReason,
(entity) -> {
entity.customName(Component.text("Toast"));
entity.setCustomNameVisible(false);
});
} }
@Override @Override
public boolean isInstance(@NotNull LivingEntity entity) { public boolean isInstance(@NotNull LivingEntity entity) {
if (!(entity instanceof Rabbit)) return false; if (!(entity instanceof Rabbit)) return false;
return entity.getCustomName() != null && entity.getCustomName().equals("Toast"); return Objects.equals(entity.customName(), Component.text("Toast"));
} }
} }