diff --git a/.gitignore b/.gitignore index 6cdb71f..faa0f40 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ buildNumber.properties .mvn/timing.properties # https://github.com/takari/maven-wrapper#usage-without-binary-jar .mvn/wrapper/maven-wrapper.jar +.gitignore \ No newline at end of file diff --git a/src/main/java/net/nuggetmc/ai/bot/Bot.java b/src/main/java/net/nuggetmc/ai/bot/Bot.java index 1d38ee3..656335a 100644 --- a/src/main/java/net/nuggetmc/ai/bot/Bot.java +++ b/src/main/java/net/nuggetmc/ai/bot/Bot.java @@ -4,9 +4,9 @@ import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Pair; import net.minecraft.server.v1_16_R3.*; import net.nuggetmc.ai.PlayerAI; +import net.nuggetmc.ai.utils.BotUtils; import net.nuggetmc.ai.utils.MathUtils; import net.nuggetmc.ai.utils.MojangAPI; -import net.nuggetmc.ai.utils.SteveUUID; import org.bukkit.Material; import org.bukkit.SoundCategory; import org.bukkit.World; @@ -50,7 +50,7 @@ public class Bot extends EntityPlayer { MinecraftServer nmsServer = ((CraftServer) Bukkit.getServer()).getServer(); WorldServer nmsWorld = ((CraftWorld) Objects.requireNonNull(loc.getWorld())).getHandle(); - UUID uuid = SteveUUID.generate(); + UUID uuid = BotUtils.randomSteveUUID(); CustomGameProfile profile = new CustomGameProfile(uuid, name, skin); PlayerInteractManager interactManager = new PlayerInteractManager(nmsWorld); diff --git a/src/main/java/net/nuggetmc/ai/bot/BotUtils.java b/src/main/java/net/nuggetmc/ai/utils/BotUtils.java similarity index 75% rename from src/main/java/net/nuggetmc/ai/bot/BotUtils.java rename to src/main/java/net/nuggetmc/ai/utils/BotUtils.java index d732c33..e7a2a09 100644 --- a/src/main/java/net/nuggetmc/ai/bot/BotUtils.java +++ b/src/main/java/net/nuggetmc/ai/utils/BotUtils.java @@ -1,12 +1,24 @@ -package net.nuggetmc.ai.bot; +package net.nuggetmc.ai.utils; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.util.BoundingBox; import org.bukkit.util.Vector; +import java.util.UUID; + public class BotUtils { + public static UUID randomSteveUUID() { + UUID uuid = UUID.randomUUID(); + + if (uuid.hashCode() % 2 == 0) { + return uuid; + } + + return randomSteveUUID(); + } + public static boolean solidAt(Location loc) { // not perfect, still cuts corners of fences Block block = loc.getBlock(); BoundingBox box = block.getBoundingBox(); diff --git a/src/main/java/net/nuggetmc/ai/utils/SteveUUID.java b/src/main/java/net/nuggetmc/ai/utils/SteveUUID.java deleted file mode 100644 index 303bcd7..0000000 --- a/src/main/java/net/nuggetmc/ai/utils/SteveUUID.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.nuggetmc.ai.utils; - -import java.util.UUID; - -public class SteveUUID { - - public static UUID generate() { - UUID uuid = UUID.randomUUID(); - - if (uuid.hashCode() % 2 == 0) { - return uuid; - } - - return generate(); - } -}