From b9424cad2345973d3dfb1a53d59661620e5cff8b Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 10 Jul 2023 02:59:02 +0800 Subject: [PATCH] Don't use guava Function/Supplier --- src/main/java/net/citizensnpcs/api/ai/goals/WanderGoal.java | 2 +- src/main/java/net/citizensnpcs/api/ai/tree/StatusMapper.java | 2 +- src/main/java/net/citizensnpcs/api/astar/AStarMachine.java | 2 +- .../java/net/citizensnpcs/api/astar/SimpleAStarStorage.java | 2 +- src/main/java/net/citizensnpcs/api/trait/TraitInfo.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/citizensnpcs/api/ai/goals/WanderGoal.java b/src/main/java/net/citizensnpcs/api/ai/goals/WanderGoal.java index ad7ad0d4..e924d61f 100644 --- a/src/main/java/net/citizensnpcs/api/ai/goals/WanderGoal.java +++ b/src/main/java/net/citizensnpcs/api/ai/goals/WanderGoal.java @@ -2,13 +2,13 @@ import java.util.Random; import java.util.function.Function; +import java.util.function.Supplier; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.event.Listener; -import com.google.common.base.Supplier; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldguard.protection.regions.ProtectedRegion; diff --git a/src/main/java/net/citizensnpcs/api/ai/tree/StatusMapper.java b/src/main/java/net/citizensnpcs/api/ai/tree/StatusMapper.java index 808c5a9d..273c960c 100644 --- a/src/main/java/net/citizensnpcs/api/ai/tree/StatusMapper.java +++ b/src/main/java/net/citizensnpcs/api/ai/tree/StatusMapper.java @@ -1,6 +1,6 @@ package net.citizensnpcs.api.ai.tree; -import com.google.common.base.Supplier; +import java.util.function.Supplier; /** * Wraps an {@link Behavior} and returns a supplied {@link BehaviorStatus} instead of the underlying status. diff --git a/src/main/java/net/citizensnpcs/api/astar/AStarMachine.java b/src/main/java/net/citizensnpcs/api/astar/AStarMachine.java index 80e699e8..27557b00 100644 --- a/src/main/java/net/citizensnpcs/api/astar/AStarMachine.java +++ b/src/main/java/net/citizensnpcs/api/astar/AStarMachine.java @@ -1,7 +1,7 @@ package net.citizensnpcs.api.astar; import com.google.common.base.Preconditions; -import com.google.common.base.Supplier; +import java.util.function.Supplier; public class AStarMachine { private Supplier storageSupplier; diff --git a/src/main/java/net/citizensnpcs/api/astar/SimpleAStarStorage.java b/src/main/java/net/citizensnpcs/api/astar/SimpleAStarStorage.java index 239ea52f..3615a37b 100644 --- a/src/main/java/net/citizensnpcs/api/astar/SimpleAStarStorage.java +++ b/src/main/java/net/citizensnpcs/api/astar/SimpleAStarStorage.java @@ -5,7 +5,7 @@ import java.util.PriorityQueue; import java.util.Queue; -import com.google.common.base.Supplier; +import java.util.function.Supplier; import com.google.common.collect.Maps; /** diff --git a/src/main/java/net/citizensnpcs/api/trait/TraitInfo.java b/src/main/java/net/citizensnpcs/api/trait/TraitInfo.java index 2279bec9..e650a909 100644 --- a/src/main/java/net/citizensnpcs/api/trait/TraitInfo.java +++ b/src/main/java/net/citizensnpcs/api/trait/TraitInfo.java @@ -1,7 +1,7 @@ package net.citizensnpcs.api.trait; import com.google.common.base.Preconditions; -import com.google.common.base.Supplier; +import java.util.function.Supplier; /** * Builds a trait.