From d433f086d5f67d660a0ab7fd9982e37997878e37 Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Tue, 14 Nov 2023 19:50:14 +1300 Subject: [PATCH] #1297: Change Consumer and Predicates to super --- .../bukkit/craftbukkit/CraftRegionAccessor.java | 14 +++++++------- .../java/org/bukkit/craftbukkit/CraftServer.java | 2 +- .../java/org/bukkit/craftbukkit/CraftWorld.java | 14 +++++++------- .../craftbukkit/generator/CraftLimitedRegion.java | 4 ++-- .../craftbukkit/scheduler/CraftScheduler.java | 12 ++++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java index f6a476a12..857ab700d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -334,7 +334,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { } @Override - public boolean generateTree(Location location, Random random, TreeType treeType, Consumer consumer) { + public boolean generateTree(Location location, Random random, TreeType treeType, Consumer consumer) { return generateTree(location, random, treeType, (consumer == null) ? null : (block) -> { consumer.accept(block); return true; @@ -342,7 +342,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { } @Override - public boolean generateTree(Location location, Random random, TreeType treeType, Predicate predicate) { + public boolean generateTree(Location location, Random random, TreeType treeType, Predicate predicate) { BlockPosition pos = CraftLocation.toBlockPosition(location); BlockStateListPopulator populator = new BlockStateListPopulator(getHandle()); boolean result = generateTree(populator, getHandle().getMinecraftWorld().getChunkSource().getGenerator(), pos, new RandomSourceWrapper(random), treeType); @@ -534,20 +534,20 @@ public abstract class CraftRegionAccessor implements RegionAccessor { } @Override - public T spawn(Location location, Class clazz, Consumer function) throws IllegalArgumentException { + public T spawn(Location location, Class clazz, Consumer function) throws IllegalArgumentException { return spawn(location, clazz, function, CreatureSpawnEvent.SpawnReason.CUSTOM); } @Override - public T spawn(Location location, Class clazz, boolean randomizeData, Consumer function) throws IllegalArgumentException { + public T spawn(Location location, Class clazz, boolean randomizeData, Consumer function) throws IllegalArgumentException { return spawn(location, clazz, function, CreatureSpawnEvent.SpawnReason.CUSTOM, randomizeData); } - public T spawn(Location location, Class clazz, Consumer function, CreatureSpawnEvent.SpawnReason reason) throws IllegalArgumentException { + public T spawn(Location location, Class clazz, Consumer function, CreatureSpawnEvent.SpawnReason reason) throws IllegalArgumentException { return spawn(location, clazz, function, reason, true); } - public T spawn(Location location, Class clazz, Consumer function, CreatureSpawnEvent.SpawnReason reason, boolean randomizeData) throws IllegalArgumentException { + public T spawn(Location location, Class clazz, Consumer function, CreatureSpawnEvent.SpawnReason reason, boolean randomizeData) throws IllegalArgumentException { net.minecraft.world.entity.Entity entity = createEntity(location, clazz, randomizeData); return addEntity(entity, reason, function, randomizeData); @@ -559,7 +559,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { } @SuppressWarnings("unchecked") - public T addEntity(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason, Consumer function, boolean randomizeData) throws IllegalArgumentException { + public T addEntity(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason, Consumer function, boolean randomizeData) throws IllegalArgumentException { Preconditions.checkArgument(entity != null, "Cannot spawn null entity"); if (randomizeData && entity instanceof EntityInsentient) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 827bfd357..b1787a45f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2284,7 +2284,7 @@ public final class CraftServer implements Server { } @Override - public BlockData createBlockData(org.bukkit.Material material, Consumer consumer) { + public BlockData createBlockData(org.bukkit.Material material, Consumer consumer) { BlockData data = createBlockData(material); if (consumer != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 49305e511..c71f276cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -484,7 +484,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } @Override - public org.bukkit.entity.Item dropItem(Location loc, ItemStack item, Consumer function) { + public org.bukkit.entity.Item dropItem(Location loc, ItemStack item, Consumer function) { Preconditions.checkArgument(loc != null, "Location cannot be null"); Preconditions.checkArgument(item != null, "ItemStack cannot be null"); @@ -504,7 +504,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } @Override - public org.bukkit.entity.Item dropItemNaturally(Location loc, ItemStack item, Consumer function) { + public org.bukkit.entity.Item dropItemNaturally(Location loc, ItemStack item, Consumer function) { Preconditions.checkArgument(loc != null, "Location cannot be null"); Preconditions.checkArgument(item != null, "ItemStack cannot be null"); @@ -826,7 +826,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } @Override - public Collection getNearbyEntities(Location location, double x, double y, double z, Predicate filter) { + public Collection getNearbyEntities(Location location, double x, double y, double z, Predicate filter) { Preconditions.checkArgument(location != null, "Location cannot be null"); Preconditions.checkArgument(this.equals(location.getWorld()), "Location cannot be in a different world"); @@ -840,7 +840,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } @Override - public Collection getNearbyEntities(BoundingBox boundingBox, Predicate filter) { + public Collection getNearbyEntities(BoundingBox boundingBox, Predicate filter) { Preconditions.checkArgument(boundingBox != null, "BoundingBox cannot be null"); AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ()); @@ -868,12 +868,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, Predicate filter) { + public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, Predicate filter) { return this.rayTraceEntities(start, direction, maxDistance, 0.0D, filter); } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate filter) { + public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate filter) { Preconditions.checkArgument(start != null, "Location start cannot be null"); Preconditions.checkArgument(this.equals(start.getWorld()), "Location start cannot be in a different world"); start.checkFinite(); @@ -949,7 +949,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } @Override - public RayTraceResult rayTrace(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate filter) { + public RayTraceResult rayTrace(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate filter) { RayTraceResult blockHit = this.rayTraceBlocks(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks); Vector startVec = null; double blockHitDistance = maxDistance; diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java index 7afb8d38b..c73afec09 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java @@ -228,7 +228,7 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe } @Override - public boolean generateTree(Location location, Random random, TreeType treeType, Consumer consumer) { + public boolean generateTree(Location location, Random random, TreeType treeType, Consumer consumer) { Preconditions.checkArgument(isInRegion(location), "Coordinates %s, %s, %s are not in the region", location.getBlockX(), location.getBlockY(), location.getBlockZ()); return super.generateTree(location, random, treeType, consumer); } @@ -241,7 +241,7 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe } @Override - public T spawn(Location location, Class clazz, Consumer function, CreatureSpawnEvent.SpawnReason reason) throws IllegalArgumentException { + public T spawn(Location location, Class clazz, Consumer function, CreatureSpawnEvent.SpawnReason reason) throws IllegalArgumentException { Preconditions.checkArgument(isInRegion(location), "Coordinates %s, %s, %s are not in the region", location.getBlockX(), location.getBlockY(), location.getBlockZ()); return super.spawn(location, clazz, function, reason); } diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index 1fb9b4582..d7da2a0b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -121,7 +121,7 @@ public class CraftScheduler implements BukkitScheduler { } @Override - public void runTask(Plugin plugin, Consumer task) throws IllegalArgumentException { + public void runTask(Plugin plugin, Consumer task) throws IllegalArgumentException { runTaskLater(plugin, task, 0L); } @@ -137,7 +137,7 @@ public class CraftScheduler implements BukkitScheduler { } @Override - public void runTaskAsynchronously(Plugin plugin, Consumer task) throws IllegalArgumentException { + public void runTaskAsynchronously(Plugin plugin, Consumer task) throws IllegalArgumentException { runTaskLaterAsynchronously(plugin, task, 0L); } @@ -152,7 +152,7 @@ public class CraftScheduler implements BukkitScheduler { } @Override - public void runTaskLater(Plugin plugin, Consumer task, long delay) throws IllegalArgumentException { + public void runTaskLater(Plugin plugin, Consumer task, long delay) throws IllegalArgumentException { runTaskTimer(plugin, task, delay, CraftTask.NO_REPEATING); } @@ -168,12 +168,12 @@ public class CraftScheduler implements BukkitScheduler { } @Override - public void runTaskLaterAsynchronously(Plugin plugin, Consumer task, long delay) throws IllegalArgumentException { + public void runTaskLaterAsynchronously(Plugin plugin, Consumer task, long delay) throws IllegalArgumentException { runTaskTimerAsynchronously(plugin, task, delay, CraftTask.NO_REPEATING); } @Override - public void runTaskTimerAsynchronously(Plugin plugin, Consumer task, long delay, long period) throws IllegalArgumentException { + public void runTaskTimerAsynchronously(Plugin plugin, Consumer task, long delay, long period) throws IllegalArgumentException { runTaskTimerAsynchronously(plugin, (Object) task, delay, CraftTask.NO_REPEATING); } @@ -188,7 +188,7 @@ public class CraftScheduler implements BukkitScheduler { } @Override - public void runTaskTimer(Plugin plugin, Consumer task, long delay, long period) throws IllegalArgumentException { + public void runTaskTimer(Plugin plugin, Consumer task, long delay, long period) throws IllegalArgumentException { runTaskTimer(plugin, (Object) task, delay, period); }