From 7c09845789f13fa233b8bfcbde432f7e046a09ef Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sun, 28 Aug 2022 19:19:48 +0200 Subject: [PATCH] Revert "Remove overloading `WorldCore#getSpawner(CreatureSpawner)`" This reverts commit 1cd96b10c500cea0f7909ddf5ffd41677c9e1e5b. --- Core/src/main/java/com/songoda/core/utils/ItemUtils.java | 2 +- .../src/main/java/com/songoda/core/nms/world/WorldCore.java | 2 ++ .../com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_19_0/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java | 5 +++++ .../com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java | 4 ++++ 22 files changed, 102 insertions(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java index 05aca553..05ebf2c1 100644 --- a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java +++ b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java @@ -478,7 +478,7 @@ public class ItemUtils { /** * Quickly check to see if the two items use the same material.
- * NOTE: Does not check metadata; only checks the item material. + * NOTE: Does not check meta data; only checks the item material. * * @param is1 first item to compare * @param is2 item to compare against diff --git a/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java b/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java index 530ead7f..efe66c00 100644 --- a/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java +++ b/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java @@ -10,6 +10,8 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public interface WorldCore { + SSpawner getSpawner(CreatureSpawner spawner); + SSpawner getSpawner(Location location); SItemStack getItemStack(ItemStack item); diff --git a/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java index dbe1ffa5..ad85a0a1 100644 --- a/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java @@ -25,6 +25,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java index 4a538497..62dedf0c 100644 --- a/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java @@ -25,6 +25,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java index 1b13bac8..f1690ee1 100644 --- a/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java @@ -25,6 +25,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java index e9c6de92..837ba3c4 100644 --- a/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java @@ -24,6 +24,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java index a8ad6f87..c7946e90 100644 --- a/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java @@ -24,6 +24,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java index 4fcabb62..1ea611a7 100644 --- a/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java index 8d12d667..96c746da 100644 --- a/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java index 0aec40e8..4a749de6 100644 --- a/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java index a3301da6..153b8251 100644 --- a/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java index 48009acf..1f3364ac 100644 --- a/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java index e041d9f6..9f0dfc3e 100644 --- a/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java index 672024bb..8ab61f78 100644 --- a/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java index e50628a8..882f7e4f 100644 --- a/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_19_0/src/main/java/com/songoda/core/nms/v1_19_0/world/WorldCoreImpl.java b/NMS/NMS-v1_19_0/src/main/java/com/songoda/core/nms/v1_19_0/world/WorldCoreImpl.java index 9040a92a..5198c3e5 100644 --- a/NMS/NMS-v1_19_0/src/main/java/com/songoda/core/nms/v1_19_0/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_0/src/main/java/com/songoda/core/nms/v1_19_0/world/WorldCoreImpl.java @@ -29,6 +29,11 @@ import org.jetbrains.annotations.NotNull; import java.util.Objects; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java index da85a6ad..eefc3a64 100644 --- a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java @@ -26,6 +26,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java index 6e70551a..596e787b 100644 --- a/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java @@ -25,6 +25,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java index a6476db5..910e1c86 100644 --- a/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java @@ -25,6 +25,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java index 9daf0ff0..5b5fb3f9 100644 --- a/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java @@ -25,6 +25,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java index 7b70200e..829c8604 100644 --- a/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java @@ -25,6 +25,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } + @Override public SSpawner getSpawner(Location location) { return new SSpawnerImpl(location); diff --git a/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java index c5b137e4..6225f231 100644 --- a/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java @@ -25,6 +25,10 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; public class WorldCoreImpl implements WorldCore { + @Override + public SSpawner getSpawner(CreatureSpawner spawner) { + return new SSpawnerImpl(spawner.getLocation()); + } @Override public SSpawner getSpawner(Location location) {