From 1cd96b10c500cea0f7909ddf5ffd41677c9e1e5b Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sun, 28 Aug 2022 19:19:48 +0200 Subject: [PATCH] Remove overloading `WorldCore#getSpawner(CreatureSpawner)` --- 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, 1 insertion(+), 102 deletions(-) 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 e86f389a..9f9a06c1 100644 --- a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java +++ b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java @@ -471,7 +471,7 @@ public class ItemUtils { /** * Quickly check to see if the two items use the same material.
- * NOTE: Does not check meta data; only checks the item material. + * NOTE: Does not check metadata; 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 04df5aaa..f1498c30 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 @@ -11,8 +11,6 @@ import org.jetbrains.annotations.NotNull; import java.lang.reflect.InvocationTargetException; 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 423469c8..d4bf8b4e 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 @@ -26,11 +26,6 @@ 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_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 ef02d083..99b8e509 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 @@ -26,11 +26,6 @@ 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_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 dded1987..7df00295 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 @@ -26,11 +26,6 @@ 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_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 3d644902..ba7936eb 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 @@ -27,11 +27,6 @@ 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_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 427b7f8c..31acad86 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 @@ -27,11 +27,6 @@ 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_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 cb8329a2..226308ef 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 @@ -29,11 +29,6 @@ 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_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 685f3bd4..a5c1b104 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 @@ -29,11 +29,6 @@ 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_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 85a76ea7..99061231 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 @@ -29,11 +29,6 @@ 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_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 a3e1051e..2aeb5a95 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 @@ -29,11 +29,6 @@ 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_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 3d9243b9..26db872c 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 @@ -29,11 +29,6 @@ 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_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 19e002cb..14218468 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 @@ -29,11 +29,6 @@ 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_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 e97f3671..bd86cab2 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 @@ -29,11 +29,6 @@ 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_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 0d64279f..c5a09540 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 @@ -29,11 +29,6 @@ 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_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 96ae5355..363878e1 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,11 +29,6 @@ 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 9e75966e..5dc8043d 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 @@ -29,11 +29,6 @@ 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_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 df5ef295..81b35eb5 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 @@ -26,11 +26,6 @@ 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_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 9b94f43f..97db7867 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 @@ -26,11 +26,6 @@ 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_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 58db037c..a8b2e629 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 @@ -26,11 +26,6 @@ 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_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 6bf93248..ec8b7743 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 @@ -26,11 +26,6 @@ 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_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 008551a5..8f11e3ae 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 @@ -26,10 +26,6 @@ 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) {