Merge branch 'v1.21' into fix/improve-pipeline

Author: Thorinwasher

src/main/java/org/mockbukkit/mockbukkit/entity/CamelHuskMock.java

@@ -0,0 +1,36 @@
+package org.mockbukkit.mockbukkit.entity;
+
+import org.bukkit.entity.CamelHusk;
+import org.bukkit.entity.EntityType;
+import org.jspecify.annotations.NullMarked;
+import org.mockbukkit.mockbukkit.ServerMock;
+
+import java.util.UUID;
+
+/**
+ * Mock implementation of an {@link CamelHusk}.
+ *
+ * @see CamelMock
+ */
+@NullMarked
+public class CamelHuskMock extends CamelMock implements CamelHusk
+{
+
+	/**
+	 * Constructs a new {@link CamelHusk} on the provided {@link ServerMock} with a specified {@link UUID}.
+	 *
+	 * @param server The server to create the entity on.
+	 * @param uuid   The UUID of the entity.
+	 */
+	public CamelHuskMock(ServerMock server, UUID uuid)
+	{
+		super(server, uuid);
+	}
+
+	@Override
+	public EntityType getType()
+	{
+		return EntityType.CAMEL_HUSK;
+	}
+
+}

src/main/java/org/mockbukkit/mockbukkit/entity/CamelMock.java

@@ -8,6 +8,11 @@
 
 import java.util.UUID;
 
+/**
+ * Mock implementation of an {@link Camel}.
+ *
+ * @see AbstractHorseMock
+ */
 public class CamelMock extends AbstractHorseMock implements Camel
 {
 

src/main/java/org/mockbukkit/mockbukkit/entity/EntityTypesMock.java

@@ -17,6 +17,7 @@
 import org.bukkit.entity.Breeze;
 import org.bukkit.entity.BreezeWindCharge;
 import org.bukkit.entity.Camel;
+import org.bukkit.entity.CamelHusk;
 import org.bukkit.entity.Cat;
 import org.bukkit.entity.CaveSpider;
 import org.bukkit.entity.ChestBoat;
@@ -76,10 +77,12 @@
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Mule;
 import org.bukkit.entity.MushroomCow;
+import org.bukkit.entity.Nautilus;
 import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.OminousItemSpawner;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Panda;
+import org.bukkit.entity.Parched;
 import org.bukkit.entity.Parrot;
 import org.bukkit.entity.Phantom;
 import org.bukkit.entity.Pig;
@@ -236,6 +239,7 @@ public static Builder withDefaults()
 				.register(Breeze.class, BreezeMock.class, BreezeMock::new)
 				.register(BreezeWindCharge.class, BreezeWindChargeMock.class, BreezeWindChargeMock::new)
 				.register(Camel.class, CamelMock.class, CamelMock::new)
+				.register(CamelHusk.class, CamelHuskMock.class, CamelHuskMock::new)
 				.register(Cat.class, CatMock.class, CatMock::new)
 				.register(CaveSpider.class, CaveSpiderMock.class, CaveSpiderMock::new)
 				.register(CherryBoat.class, CherryBoatMock.class, CherryBoatMock::new)
@@ -304,6 +308,7 @@ public static Builder withDefaults()
 				.register(Minecart.class, RideableMinecartMock.class, RideableMinecartMock::new)
 				.register(Mule.class, MuleMock.class, MuleMock::new)
 				.register(MushroomCow.class, MushroomCowMock.class, MushroomCowMock::new)
+				.register(Nautilus.class, NautilusMock.class, NautilusMock::new)
 				.register(OakBoat.class, OakBoatMock.class, OakBoatMock::new)
 				.register(OakChestBoat.class, OakChestBoatMock.class, OakChestBoatMock::new)
 				.register(Ocelot.class, OcelotMock.class, OcelotMock::new)
@@ -312,6 +317,7 @@ public static Builder withDefaults()
 				.register(PaleOakBoat.class, PaleOakBoatMock.class, PaleOakBoatMock::new)
 				.register(PaleOakChestBoat.class, PaleOakChestBoatMock.class, PaleOakChestBoatMock::new)
 				.register(Panda.class, PandaMock.class, PandaMock::new)
+				.register(Parched.class, ParchedMock.class, ParchedMock::new)
 				.register(Parrot.class, ParrotMock.class, ParrotMock::new)
 				.register(Phantom.class, PhantomMock.class, PhantomMock::new)
 				.register(Pig.class, PigMock.class, PigMock::new)
@@ -412,10 +418,13 @@ else if (bukkitClazz == Player.class)
 			var myConstructor = bukkitClazz.getDeclaredConstructor(ServerMock.class, UUID.class);
 			return (EntityMock) myConstructor.newInstance(server, entityUUID);
 		}
-		catch (NoSuchMethodException | InstantiationException | IllegalAccessException |
-			   InvocationTargetException e)
+		catch (NoSuchMethodException e)
 		{
-			log.warn("Couldn't find: " + e.getMessage() + " for " + bukkitClazz.getName() + ". Falling back to reflection.", e);
+			log.debug("Method with signature '{}' does not exist in '{}', falling back to reflection.", e.getMessage(), bukkitClazz.getName());
+		}
+		catch (InstantiationException | IllegalAccessException | InvocationTargetException e)
+		{
+			log.warn("Couldn't find: {} for {}. Falling back to reflection.", e.getMessage(), bukkitClazz.getName(), e);
 		}
 
 		EntityData<? extends Entity, ? extends EntityMock> data = bukkitToMockData.get(bukkitClazz);

src/main/java/org/mockbukkit/mockbukkit/entity/NautilusMock.java

@@ -0,0 +1,36 @@
+package org.mockbukkit.mockbukkit.entity;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Nautilus;
+import org.jspecify.annotations.NullMarked;
+import org.mockbukkit.mockbukkit.ServerMock;
+
+import java.util.UUID;
+
+/**
+ * Mock implementation of an {@link Nautilus}.
+ *
+ * @see AbstractNautilusMock
+ */
+@NullMarked
+public class NautilusMock extends AbstractNautilusMock implements Nautilus
+{
+
+	/**
+	 * Constructs a new {@link Nautilus} on the provided {@link ServerMock} with a specified {@link UUID}.
+	 *
+	 * @param server The server to create the entity on.
+	 * @param uuid   The UUID of the entity.
+	 */
+	public NautilusMock(ServerMock server, UUID uuid)
+	{
+		super(server, uuid);
+	}
+
+	@Override
+	public EntityType getType()
+	{
+		return EntityType.NAUTILUS;
+	}
+
+}

src/main/java/org/mockbukkit/mockbukkit/entity/ParchedMock.java

@@ -0,0 +1,44 @@
+package org.mockbukkit.mockbukkit.entity;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Parched;
+import org.bukkit.entity.Skeleton;
+import org.jspecify.annotations.NullMarked;
+import org.mockbukkit.mockbukkit.ServerMock;
+
+import java.util.UUID;
+
+/**
+ * Mock implementation of an {@link Parched}.
+ *
+ * @see AbstractSkeletonMock
+ */
+@NullMarked
+public class ParchedMock extends AbstractSkeletonMock implements Parched
+{
+
+	/**
+	 * Constructs a new {@link Parched} on the provided {@link ServerMock} with a specified {@link UUID}.
+	 *
+	 * @param server The server to create the entity on.
+	 * @param uuid   The UUID of the entity.
+	 */
+	public ParchedMock(ServerMock server, UUID uuid)
+	{
+		super(server, uuid);
+	}
+
+	@Override
+	@Deprecated(since = "1.17", forRemoval = true)
+	public Skeleton.SkeletonType getSkeletonType()
+	{
+		return Skeleton.SkeletonType.PARCHED;
+	}
+
+	@Override
+	public EntityType getType()
+	{
+		return EntityType.PARCHED;
+	}
+
+}