From b052a04ddbdf0cde89659abdf09df8f6409eb95a Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 00:22:47 -0400 Subject: [PATCH 1/8] Moved to gradle & started work on separating API and plugin --- .../net/nuggetmc/tplus/api/Terminator.java | 91 +++++++++++ .../agent/legacyagent/ai/ActivationType.java | 2 +- .../api}/agent/legacyagent/ai/BotData.java | 10 +- .../agent/legacyagent/ai/BotDataType.java | 2 +- .../api}/agent/legacyagent/ai/BotNode.java | 2 +- .../agent/legacyagent/ai/NeuralNetwork.java | 2 +- .../agent/legacyagent/ai/NodeConnections.java | 2 +- .../net/nuggetmc/tplus/utils/ChatUtils.java | 0 .../net/nuggetmc/tplus/utils/MathUtils.java | 20 +-- .../net/nuggetmc/tplus/TerminatorPlus.java | 0 .../main/java/net/nuggetmc/tplus/bot/Bot.java | 146 +++++++++++------- .../net/nuggetmc/tplus/bot/BotManager.java | 41 +++-- .../nuggetmc/tplus/bot/CustomGameProfile.java | 0 .../net/nuggetmc/tplus/bot/agent/Agent.java | 0 .../tplus/bot/agent/botagent/BotAgent.java | 0 .../bot/agent/botagent/BotSituation.java | 0 .../agent/botagent/VerticalDisplacement.java | 0 .../bot/agent/legacyagent/EnumTargetGoal.java | 0 .../bot/agent/legacyagent/LegacyAgent.java | 10 +- .../agent/legacyagent/LegacyBlockCheck.java | 0 .../bot/agent/legacyagent/LegacyItems.java | 0 .../bot/agent/legacyagent/LegacyLevel.java | 0 .../bot/agent/legacyagent/LegacyMats.java | 0 .../bot/agent/legacyagent/LegacyUtils.java | 2 - .../agent/legacyagent/LegacyWorldManager.java | 0 .../legacyagent/ai/IntelligenceAgent.java | 18 ++- .../bot/event/BotDamageByPlayerEvent.java | 0 .../tplus/bot/event/BotDeathEvent.java | 8 +- .../tplus/bot/event/BotFallDamageEvent.java | 0 .../bot/event/BotKilledByPlayerEvent.java | 0 .../tplus/command/CommandHandler.java | 0 .../tplus/command/CommandInstance.java | 0 .../nuggetmc/tplus/command/CommandMethod.java | 0 .../tplus/command/annotation/Arg.java | 0 .../tplus/command/annotation/Autofill.java | 0 .../tplus/command/annotation/Command.java | 0 .../tplus/command/annotation/OptArg.java | 0 .../tplus/command/annotation/Require.java | 0 .../tplus/command/annotation/TextArg.java | 0 .../tplus/command/commands/AICommand.java | 2 +- .../tplus/command/commands/BotCommand.java | 0 .../tplus/command/commands/MainCommand.java | 0 .../command/exception/ArgCountException.java | 0 .../command/exception/ArgParseException.java | 0 .../command/exception/NonPlayerException.java | 0 .../nuggetmc/tplus/command/nms/TPCommand.java | 0 .../net/nuggetmc/tplus/utils/BotUtils.java | 0 .../net/nuggetmc/tplus/utils/Debugger.java | 2 +- .../net/nuggetmc/tplus/utils/ItemUtils.java | 0 .../net/nuggetmc/tplus/utils/MojangAPI.java | 0 .../net/nuggetmc/tplus/utils/PlayerUtils.java | 0 .../net/nuggetmc/tplus/utils/Singularity.java | 0 build.gradle.kts | 18 +++ pom.xml | 118 -------------- settings.gradle.kts | 10 ++ 55 files changed, 273 insertions(+), 233 deletions(-) create mode 100644 TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java rename {src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/ai/ActivationType.java (62%) rename {src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/ai/BotData.java (83%) rename {src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/ai/BotDataType.java (85%) rename {src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/ai/BotNode.java (77%) rename {src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/ai/NeuralNetwork.java (98%) rename {src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/ai/NodeConnections.java (97%) rename {src => TerminatorPlus-API/src}/main/java/net/nuggetmc/tplus/utils/ChatUtils.java (100%) rename {src => TerminatorPlus-API/src}/main/java/net/nuggetmc/tplus/utils/MathUtils.java (93%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/TerminatorPlus.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/Bot.java (91%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/BotManager.java (85%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/Agent.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java (99%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java (97%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java (94%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java (55%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/CommandHandler.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/CommandInstance.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/CommandMethod.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/annotation/Arg.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/annotation/Autofill.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/annotation/Command.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/annotation/OptArg.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/annotation/Require.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/annotation/TextArg.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/commands/AICommand.java (98%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/exception/ArgCountException.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/exception/ArgParseException.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/exception/NonPlayerException.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/command/nms/TPCommand.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/utils/BotUtils.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/utils/Debugger.java (99%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/utils/ItemUtils.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/utils/MojangAPI.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java (100%) rename {src => TerminatorPlus-Plugin/src}/main/java/net/nuggetmc/tplus/utils/Singularity.java (100%) create mode 100644 build.gradle.kts delete mode 100644 pom.xml create mode 100644 settings.gradle.kts diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java new file mode 100644 index 0000000..c377524 --- /dev/null +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java @@ -0,0 +1,91 @@ +package net.nuggetmc.tplus.api; + +import com.mojang.authlib.GameProfile; +import net.kyori.adventure.text.Component; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.BlockFace; +import org.bukkit.entity.Entity; +import org.bukkit.inventory.EquipmentSlot; +import org.bukkit.inventory.ItemStack; +import org.bukkit.util.Vector; + +public interface Terminator { + + String getBotName(); + + GameProfile getGameProfile(); + + NeuralNetwork getNeuralNetwork(); + + void setNeuralNetwork(NeuralNetwork neuralNetwork); + + boolean hasNeuralNetwork(); + + Location getLocation(); + + float getHealth(); + + float getMaxHealth(); + + void ignite(); + + boolean isOnFire(); + + boolean isFalling(); + + boolean isBlocking(); + + void block(int length, int cooldown); + + boolean isInWater(); + + void jump(Vector velocity); + + void jump(); + + void walk(Vector velocity); + + void look(BlockFace face); + + void attack(Entity target); + + void attemptBlockPlace(Location loc, Material type, boolean down); + + void punch(); + + void swim(); + + void sneak(); + + void stand(); + + void addFriction(double factor); + + void removeVisually(); + + int getKills(); + + void incrementKills(); + + void setItem(ItemStack item); + + void setItem(ItemStack item, EquipmentSlot slot); + + void setItemOffhand(ItemStack item); + + void setDefaultItem(ItemStack item); + + Vector getOffset(); + + Vector getVelocity(); + + void setVelocity(Vector velocity); + + void addVelocity(Vector velocity); + + int getAliveTicks(); + + boolean tickDelay(int ticks); +} diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/ActivationType.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/ActivationType.java similarity index 62% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/ActivationType.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/ActivationType.java index 76bae1c..d16832d 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/ActivationType.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/ActivationType.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent.ai; +package net.nuggetmc.tplus.api.agent.legacyagent.ai; public enum ActivationType { TANH, diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotData.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java similarity index 83% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotData.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java index 9be0ba9..c4f1bc2 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotData.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java @@ -1,6 +1,6 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent.ai; +package net.nuggetmc.tplus.api.agent.legacyagent.ai; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; import net.nuggetmc.tplus.utils.MathUtils; import org.apache.commons.lang.StringUtils; import org.bukkit.Location; @@ -14,7 +14,7 @@ public class BotData { private final Map values; - private BotData(Bot bot, LivingEntity target) { + private BotData(Terminator bot, LivingEntity target) { this.values = new HashMap<>(); Location a = bot.getLocation(); @@ -25,10 +25,10 @@ public class BotData { values.put(BotDataType.CRITICAL_HEALTH, health >= 5 ? 0 : 5D - health); values.put(BotDataType.DISTANCE_XZ, Math.sqrt(MathUtils.square(a.getX() - b.getX()) + MathUtils.square(a.getZ() - b.getZ()))); values.put(BotDataType.DISTANCE_Y, b.getY() - a.getY()); - values.put(BotDataType.ENEMY_BLOCKING, target instanceof Player && ((Player)target).isBlocking() ? 1D : 0); + values.put(BotDataType.ENEMY_BLOCKING, target instanceof Player && ((Player) target).isBlocking() ? 1D : 0); } - public static BotData generate(Bot bot, LivingEntity target) { + public static BotData generate(Terminator bot, LivingEntity target) { return new BotData(bot, target); } diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotDataType.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotDataType.java similarity index 85% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotDataType.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotDataType.java index 5145a45..c6ab0fd 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotDataType.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotDataType.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent.ai; +package net.nuggetmc.tplus.api.agent.legacyagent.ai; public enum BotDataType { CRITICAL_HEALTH("h"), diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotNode.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotNode.java similarity index 77% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotNode.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotNode.java index 6569d46..a168b53 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/BotNode.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotNode.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent.ai; +package net.nuggetmc.tplus.api.agent.legacyagent.ai; public enum BotNode { BLOCK, // block (can't attack while blocking) diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/NeuralNetwork.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NeuralNetwork.java similarity index 98% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/NeuralNetwork.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NeuralNetwork.java index 4e95195..087e7cd 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/NeuralNetwork.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NeuralNetwork.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent.ai; +package net.nuggetmc.tplus.api.agent.legacyagent.ai; import net.md_5.bungee.api.ChatColor; import net.nuggetmc.tplus.utils.MathUtils; diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/NodeConnections.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NodeConnections.java similarity index 97% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/NodeConnections.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NodeConnections.java index f9f2221..d809d16 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/NodeConnections.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NodeConnections.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent.ai; +package net.nuggetmc.tplus.api.agent.legacyagent.ai; import java.util.Arrays; import java.util.HashMap; diff --git a/src/main/java/net/nuggetmc/tplus/utils/ChatUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/ChatUtils.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/utils/ChatUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/ChatUtils.java diff --git a/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java similarity index 93% rename from src/main/java/net/nuggetmc/tplus/utils/MathUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java index 8f2beea..e9a8dee 100644 --- a/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java @@ -1,6 +1,6 @@ package net.nuggetmc.tplus.utils; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; import org.bukkit.util.NumberConversions; import org.bukkit.util.Vector; @@ -22,9 +22,7 @@ public class MathUtils { if (x == 0.0D && z == 0.0D) { out[1] = (float) (dir.getY() > 0.0D ? -90 : 90); - } - - else { + } else { double theta = Math.atan2(-x, z); out[0] = (float) Math.toDegrees((theta + 6.283185307179586D) % 6.283185307179586D); @@ -45,9 +43,7 @@ public class MathUtils { if (x == 0.0D && z == 0.0D) { result = (float) (dir.getY() > 0.0D ? -90 : 90); - } - - else { + } else { double x2 = NumberConversions.square(x); double z2 = NumberConversions.square(z); double xz = Math.sqrt(x2 + z2); @@ -92,8 +88,8 @@ public class MathUtils { return FORMATTER_2.format(n); } - public static List> sortByValue(HashMap hm) { - List> list = new LinkedList<>(hm.entrySet()); + public static List> sortByValue(HashMap hm) { + List> list = new LinkedList<>(hm.entrySet()); list.sort(Map.Entry.comparingByValue()); Collections.reverse(list); return list; @@ -161,9 +157,9 @@ public class MathUtils { double dist = distribution(list, mid); double p = mutationSize * dist / Math.sqrt(list.size()); - return new double[] { - mid - p, - mid + p + return new double[]{ + mid - p, + mid + p }; } diff --git a/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/TerminatorPlus.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/Bot.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java similarity index 91% rename from src/main/java/net/nuggetmc/tplus/bot/Bot.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java index 8bc6a1f..6340533 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/Bot.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java @@ -8,8 +8,6 @@ import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; import net.minecraft.network.protocol.game.*; -import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -26,18 +24,17 @@ import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.nuggetmc.tplus.TerminatorPlus; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.bot.agent.Agent; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.bot.event.BotDamageByPlayerEvent; import net.nuggetmc.tplus.bot.event.BotFallDamageEvent; import net.nuggetmc.tplus.bot.event.BotKilledByPlayerEvent; import net.nuggetmc.tplus.utils.*; -import org.bukkit.Material; -import org.bukkit.SoundCategory; -import org.bukkit.World; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.craftbukkit.v1_18_R1.CraftEquipmentSlot; import org.bukkit.craftbukkit.v1_18_R1.CraftServer; import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer; @@ -46,7 +43,6 @@ import org.bukkit.entity.Damageable; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitScheduler; -import org.bukkit.util.BoundingBox; import org.bukkit.util.Vector; import javax.annotation.Nullable; @@ -55,47 +51,26 @@ import java.util.Collections; import java.util.Objects; import java.util.UUID; -public class Bot extends ServerPlayer { +public class Bot extends ServerPlayer implements Terminator { private final TerminatorPlus plugin; private final BukkitScheduler scheduler; private final Agent agent; - - private NeuralNetwork network; - - public NeuralNetwork getNeuralNetwork() { - return network; - } - - public void setNeuralNetwork(NeuralNetwork network) { - this.network = network; - } - - public boolean hasNeuralNetwork() { - return network != null; - } - + private final Vector offset; public ItemStack defaultItem; - + private NeuralNetwork network; private boolean shield; private boolean blocking; private boolean blockUse; - private Vector velocity; private Vector oldVelocity; - private boolean removeOnDeath; - private int aliveTicks; private int kills; - private byte fireTicks; private byte groundTicks; private byte jumpTicks; private byte noFallTicks; - - private final Vector offset; - private Bot(MinecraftServer minecraftServer, ServerLevel worldServer, GameProfile profile) { super(minecraftServer, worldServer, profile); @@ -139,15 +114,35 @@ public class Bot extends ServerPlayer { bot.setRot(loc.getYaw(), loc.getPitch()); bot.getBukkitEntity().setNoDamageTicks(0); Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().connection.send( - new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, bot))); + new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, bot))); nmsWorld.addFreshEntity(bot); bot.renderAll(); - + TerminatorPlus.getInstance().getManager().add(bot); return bot; } + @Override + public String getBotName() { + return displayName; + } + + @Override + public NeuralNetwork getNeuralNetwork() { + return network; + } + + @Override + public void setNeuralNetwork(NeuralNetwork network) { + this.network = network; + } + + @Override + public boolean hasNeuralNetwork() { + return network != null; + } + private void renderAll() { Packet[] packets = getRenderPacketsNoInfo(); Bukkit.getOnlinePlayers().forEach(p -> renderNoInfo(((CraftPlayer) p).getHandle().connection, packets, false)); @@ -164,7 +159,7 @@ public class Bot extends ServerPlayer { connection.send(packets[3]); } } - + private void renderNoInfo(ServerGamePacketListenerImpl connection, Packet[] packets, boolean login) { connection.send(packets[0]); connection.send(packets[1]); @@ -181,38 +176,43 @@ public class Bot extends ServerPlayer { } private Packet[] getRenderPackets() { - return new Packet[] { - new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, this), - new ClientboundAddPlayerPacket(this), - new ClientboundSetEntityDataPacket(this.getId(), this.entityData, true), - new ClientboundRotateHeadPacket(this, (byte) ((this.yHeadRot * 256f) / 360f)) - }; - } - - private Packet[] getRenderPacketsNoInfo() { - return new Packet[] { - new ClientboundAddPlayerPacket(this), - new ClientboundSetEntityDataPacket(this.getId(), this.entityData, true), - new ClientboundRotateHeadPacket(this, (byte) ((this.yHeadRot * 256f) / 360f)) + return new Packet[]{ + new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, this), + new ClientboundAddPlayerPacket(this), + new ClientboundSetEntityDataPacket(this.getId(), this.entityData, true), + new ClientboundRotateHeadPacket(this, (byte) ((this.yHeadRot * 256f) / 360f)) }; } + private Packet[] getRenderPacketsNoInfo() { + return new Packet[]{ + new ClientboundAddPlayerPacket(this), + new ClientboundSetEntityDataPacket(this.getId(), this.entityData, true), + new ClientboundRotateHeadPacket(this, (byte) ((this.yHeadRot * 256f) / 360f)) + }; + } + + @Override public void setDefaultItem(ItemStack item) { this.defaultItem = item; } + @Override public Vector getOffset() { return offset; } + @Override public Vector getVelocity() { return velocity.clone(); } + @Override public void setVelocity(Vector vector) { this.velocity = vector; } + @Override public void addVelocity(Vector vector) { // This can cause lag? (maybe i fixed it with the new static method) if (MathUtils.isNotFinite(vector)) { velocity = vector; @@ -222,10 +222,12 @@ public class Bot extends ServerPlayer { velocity.add(vector); } + @Override public int getAliveTicks() { return aliveTicks; } + @Override public boolean tickDelay(int i) { return aliveTicks % i == 0; } @@ -272,8 +274,8 @@ public class Bot extends ServerPlayer { fireDamageCheck(); fallDamageCheck(); - - if(position().y < -64) { + + if (position().y < -64) { die(DamageSource.OUT_OF_WORLD); } @@ -328,6 +330,7 @@ public class Bot extends ServerPlayer { } } + @Override public void ignite() { if (fireTicks <= 1) setOnFirePackets(true); fireTicks = 100; @@ -338,6 +341,7 @@ public class Bot extends ServerPlayer { //sendPacket(new ClientboundSetEntityDataPacket(getId(), entityData, false)); } + @Override public boolean isOnFire() { return fireTicks != 0; } @@ -354,10 +358,12 @@ public class Bot extends ServerPlayer { } } + @Override public boolean isFalling() { return velocity.getY() < -0.8; } + @Override public void block(int blockLength, int cooldown) { if (!shield || blockUse) return; startBlocking(); @@ -378,6 +384,7 @@ public class Bot extends ServerPlayer { sendPacket(new ClientboundSetEntityDataPacket(getId(), entityData, true)); } + @Override public boolean isBlocking() { return blocking; } @@ -398,9 +405,7 @@ public class Bot extends ServerPlayer { y = Math.min(velocity.getY() + 0.1, 0.1); addFriction(0.8); velocity.setY(y); - } - - else { + } else { if (groundTicks != 0) { velocity.setY(0); addFriction(0.5); @@ -431,6 +436,7 @@ public class Bot extends ServerPlayer { return false; } + @Override public void jump(Vector vel) { if (jumpTicks == 0 && groundTicks > 1) { jumpTicks = 4; @@ -438,10 +444,12 @@ public class Bot extends ServerPlayer { } } + @Override public void jump() { jump(new Vector(0, 0.5, 0)); } + @Override public void walk(Vector vel) { double max = 0.4; @@ -451,6 +459,7 @@ public class Bot extends ServerPlayer { velocity = sum; } + @Override public void attack(org.bukkit.entity.Entity entity) { faceLocation(entity.getLocation()); punch(); @@ -462,6 +471,7 @@ public class Bot extends ServerPlayer { } } + @Override public void punch() { swing(InteractionHand.MAIN_HAND); } @@ -476,14 +486,14 @@ public class Bot extends ServerPlayer { World world = getBukkitEntity().getWorld(); AABB box = getBoundingBox(); - double[] xVals = new double[] { - box.minX, - box.maxX + double[] xVals = new double[]{ + box.minX, + box.maxX }; - double[] zVals = new double[] { - box.minZ, - box.maxZ + double[] zVals = new double[]{ + box.minZ, + box.maxZ }; for (double x : xVals) { @@ -505,6 +515,7 @@ public class Bot extends ServerPlayer { return groundTicks != 0; } + @Override public void addFriction(double factor) { double frictionMin = 0.01; @@ -515,6 +526,7 @@ public class Bot extends ServerPlayer { velocity.setZ(Math.abs(z) < frictionMin ? 0 : z * factor); } + @Override public void removeVisually() { this.removeTab(); this.setDead(); @@ -640,14 +652,17 @@ public class Bot extends ServerPlayer { velocity = vel; } + @Override public int getKills() { return kills; } + @Override public void incrementKills() { kills++; } + @Override public Location getLocation() { return getBukkitEntity().getLocation(); } @@ -656,6 +671,7 @@ public class Bot extends ServerPlayer { look(loc.toVector().subtract(getLocation().toVector()), false); } + @Override public void look(BlockFace face) { look(face.getDirection(), face == BlockFace.DOWN || face == BlockFace.UP); } @@ -677,6 +693,7 @@ public class Bot extends ServerPlayer { setRot(yaw, pitch); } + @Override public void attemptBlockPlace(Location loc, Material type, boolean down) { if (down) { look(BlockFace.DOWN); @@ -696,15 +713,23 @@ public class Bot extends ServerPlayer { } } + @Override public void setItem(org.bukkit.inventory.ItemStack item) { setItem(item, EquipmentSlot.MAINHAND); } + @Override public void setItemOffhand(org.bukkit.inventory.ItemStack item) { setItem(item, EquipmentSlot.OFFHAND); System.out.println("set offhand"); } + @Override + public void setItem(ItemStack item, org.bukkit.inventory.EquipmentSlot slot) { + EquipmentSlot nmsSlot = CraftEquipmentSlot.getNMS(slot); + setItem(item, nmsSlot); + } + public void setItem(org.bukkit.inventory.ItemStack item, EquipmentSlot slot) { if (item == null) item = defaultItem; @@ -718,20 +743,23 @@ public class Bot extends ServerPlayer { System.out.println("slot = " + slot); System.out.println("item = " + item); sendPacket(new ClientboundSetEquipmentPacket(getId(), new ArrayList<>(Collections.singletonList( - new Pair<>(slot, CraftItemStack.asNMSCopy(item)) + new Pair<>(slot, CraftItemStack.asNMSCopy(item)) )))); } + @Override public void swim() { getBukkitEntity().setSwimming(true); registerPose(Pose.SWIMMING); } + @Override public void sneak() { getBukkitEntity().setSneaking(true); registerPose(Pose.CROUCHING); } + @Override public void stand() { Player player = getBukkitEntity(); player.setSneaking(false); diff --git a/src/main/java/net/nuggetmc/tplus/bot/BotManager.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManager.java similarity index 85% rename from src/main/java/net/nuggetmc/tplus/bot/BotManager.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManager.java index a1326a4..b16005e 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/BotManager.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManager.java @@ -3,15 +3,17 @@ package net.nuggetmc.tplus.bot; import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.nuggetmc.tplus.bot.agent.Agent; import net.nuggetmc.tplus.bot.agent.legacyagent.LegacyAgent; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.NeuralNetwork; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.bot.event.BotDeathEvent; import net.nuggetmc.tplus.utils.MojangAPI; import org.bukkit.*; import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer; +import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; @@ -149,19 +151,31 @@ public class BotManager implements Listener { agent.stopAllTasks(); } + /** + * Get a bot from a Player object + * @param player + * @deprecated Use {@link #getBot(UUID)} instead as this may no longer work + * @return + */ + @Deprecated public Bot getBot(Player player) { // potentially memory intensive - Bot bot = null; - int id = player.getEntityId(); + return getBot(id); + } - for (Bot b : bots) { - if (id == b.getId()) { - bot = b; - break; + public Bot getBot(UUID uuid) { + Entity entity = Bukkit.getEntity(uuid); + if (entity == null) return null; + return getBot(entity.getEntityId()); + } + + public Bot getBot(int entityId) { + for (Bot bot : bots) { + if (bot.getId() == entityId) { + return bot; } } - - return bot; + return null; } @EventHandler @@ -171,10 +185,9 @@ public class BotManager implements Listener { } @EventHandler - public void onDeath(PlayerDeathEvent event) { - Player player = event.getEntity(); - Bot bot = getBot(player); - + public void onDeath(EntityDeathEvent event) { + LivingEntity bukkitEntity = event.getEntity(); + Bot bot = getBot(bukkitEntity.getEntityId()); if (bot != null) { agent.onBotDeath(new BotDeathEvent(event, bot)); } diff --git a/src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java similarity index 99% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java index 6546b32..096cc0f 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java @@ -5,9 +5,9 @@ import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket; import net.nuggetmc.tplus.bot.Bot; import net.nuggetmc.tplus.bot.BotManager; import net.nuggetmc.tplus.bot.agent.Agent; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.BotData; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.BotNode; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.NeuralNetwork; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotData; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotNode; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.bot.event.BotDamageByPlayerEvent; import net.nuggetmc.tplus.bot.event.BotDeathEvent; import net.nuggetmc.tplus.bot.event.BotFallDamageEvent; @@ -1154,7 +1154,7 @@ public class LegacyAgent extends Agent { break; } - + case NEAREST_HOSTILE: { for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) { if (entity instanceof Monster && validateCloserEntity(entity, loc, result)) { @@ -1164,7 +1164,7 @@ public class LegacyAgent extends Agent { break; } - + case NEAREST_MOB: { for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) { if (entity instanceof Mob && validateCloserEntity(entity, loc, result)) { diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java similarity index 97% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java index 24c2db7..4ce0cef 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java @@ -10,8 +10,6 @@ import org.bukkit.block.Block; import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; import org.bukkit.util.Vector; -import java.lang.reflect.Field; - public class LegacyUtils { public static boolean checkFreeSpace(Location a, Location b) { diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java similarity index 94% rename from src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java index b7efe26..c6d4086 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java @@ -2,6 +2,10 @@ package net.nuggetmc.tplus.bot.agent.legacyagent.ai; import net.minecraft.world.entity.LivingEntity; import net.nuggetmc.tplus.TerminatorPlus; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotDataType; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotNode; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.bot.Bot; import net.nuggetmc.tplus.bot.BotManager; import net.nuggetmc.tplus.bot.agent.legacyagent.EnumTargetGoal; @@ -166,22 +170,22 @@ public class IntelligenceAgent { print("Generation " + ChatColor.RED + generation + ChatColor.RESET + " has ended."); - HashMap values = new HashMap<>(); + HashMap values = new HashMap<>(); - for (Bot bot : bots.values()) { + for (Terminator bot : bots.values()) { values.put(bot, bot.getAliveTicks()); } - List> sorted = MathUtils.sortByValue(values); - Set winners = new HashSet<>(); + List> sorted = MathUtils.sortByValue(values); + Set winners = new HashSet<>(); int i = 1; - for (Map.Entry entry : sorted) { - Bot bot = entry.getKey(); + for (Map.Entry entry : sorted) { + Terminator bot = entry.getKey(); boolean check = i <= cutoff; if (check) { - print(ChatColor.GRAY + "[" + ChatColor.YELLOW + "#" + i + ChatColor.GRAY + "] " + ChatColor.GREEN + bot.getName() + print(ChatColor.GRAY + "[" + ChatColor.YELLOW + "#" + i + ChatColor.GRAY + "] " + ChatColor.GREEN + bot.getBotName() + ChatUtils.BULLET_FORMATTED + ChatColor.RED + bot.getKills() + " kills"); winners.add(bot); } diff --git a/src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java similarity index 55% rename from src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java index 40e04f5..9a1cceb 100644 --- a/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java @@ -1,14 +1,14 @@ package net.nuggetmc.tplus.bot.event; import net.nuggetmc.tplus.bot.Bot; -import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.entity.EntityDeathEvent; -public class BotDeathEvent extends PlayerDeathEvent { +public class BotDeathEvent extends EntityDeathEvent { private final Bot bot; - public BotDeathEvent(PlayerDeathEvent event, Bot bot) { - super(event.getEntity(), event.getDrops(), event.getDroppedExp(), event.getDeathMessage()); + public BotDeathEvent(EntityDeathEvent event, Bot bot) { + super(event.getEntity(), event.getDrops(), event.getDroppedExp()); this.bot = bot; } diff --git a/src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java diff --git a/src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java diff --git a/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/CommandHandler.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java diff --git a/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/CommandInstance.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java diff --git a/src/main/java/net/nuggetmc/tplus/command/CommandMethod.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandMethod.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/CommandMethod.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandMethod.java diff --git a/src/main/java/net/nuggetmc/tplus/command/annotation/Arg.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Arg.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/annotation/Arg.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Arg.java diff --git a/src/main/java/net/nuggetmc/tplus/command/annotation/Autofill.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Autofill.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/annotation/Autofill.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Autofill.java diff --git a/src/main/java/net/nuggetmc/tplus/command/annotation/Command.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Command.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/annotation/Command.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Command.java diff --git a/src/main/java/net/nuggetmc/tplus/command/annotation/OptArg.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/OptArg.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/annotation/OptArg.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/OptArg.java diff --git a/src/main/java/net/nuggetmc/tplus/command/annotation/Require.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Require.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/annotation/Require.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/Require.java diff --git a/src/main/java/net/nuggetmc/tplus/command/annotation/TextArg.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/TextArg.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/annotation/TextArg.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/annotation/TextArg.java diff --git a/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java similarity index 98% rename from src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java index adfa74f..1be5f17 100644 --- a/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java @@ -4,7 +4,7 @@ import net.nuggetmc.tplus.TerminatorPlus; import net.nuggetmc.tplus.bot.Bot; import net.nuggetmc.tplus.bot.BotManager; import net.nuggetmc.tplus.bot.agent.legacyagent.ai.IntelligenceAgent; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.NeuralNetwork; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.command.CommandHandler; import net.nuggetmc.tplus.command.CommandInstance; import net.nuggetmc.tplus.command.annotation.Arg; diff --git a/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java diff --git a/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java diff --git a/src/main/java/net/nuggetmc/tplus/command/exception/ArgCountException.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/exception/ArgCountException.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/exception/ArgCountException.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/exception/ArgCountException.java diff --git a/src/main/java/net/nuggetmc/tplus/command/exception/ArgParseException.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/exception/ArgParseException.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/exception/ArgParseException.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/exception/ArgParseException.java diff --git a/src/main/java/net/nuggetmc/tplus/command/exception/NonPlayerException.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/exception/NonPlayerException.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/exception/NonPlayerException.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/exception/NonPlayerException.java diff --git a/src/main/java/net/nuggetmc/tplus/command/nms/TPCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/nms/TPCommand.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/command/nms/TPCommand.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/nms/TPCommand.java diff --git a/src/main/java/net/nuggetmc/tplus/utils/BotUtils.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/BotUtils.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/utils/BotUtils.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/BotUtils.java diff --git a/src/main/java/net/nuggetmc/tplus/utils/Debugger.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java similarity index 99% rename from src/main/java/net/nuggetmc/tplus/utils/Debugger.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java index 2dac5ad..e091322 100644 --- a/src/main/java/net/nuggetmc/tplus/utils/Debugger.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java @@ -6,7 +6,7 @@ import net.nuggetmc.tplus.bot.Bot; import net.nuggetmc.tplus.bot.agent.Agent; import net.nuggetmc.tplus.bot.agent.legacyagent.LegacyAgent; import net.nuggetmc.tplus.bot.agent.legacyagent.ai.IntelligenceAgent; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.NeuralNetwork; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.command.commands.AICommand; import org.bukkit.*; import org.bukkit.command.CommandSender; diff --git a/src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java diff --git a/src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java diff --git a/src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java diff --git a/src/main/java/net/nuggetmc/tplus/utils/Singularity.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Singularity.java similarity index 100% rename from src/main/java/net/nuggetmc/tplus/utils/Singularity.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Singularity.java diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..d7f087e --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("java") +} + +group = "net.tplus" +version = "3.1-BETA" + +repositories { + mavenCentral() +} + +dependencies { + +} + +tasks.getByName("test") { + useJUnitPlatform() +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 9deaa4b..0000000 --- a/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - net.nuggetmc - TerminatorPlus - 3.1-BETA - TerminatorPlus - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 8 - 8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - true - shaded - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - net.md-5 - specialsource-maven-plugin - 1.2.2 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:1.18.1-R0.1-SNAPSHOT:txt:maps-mojang - true - org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:1.18.1-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT:jar:remapped-obf - - - - - - - - src/main/resources - true - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - dre-repo - https://erethon.de/repo/ - - - - - - - org.spigotmc - spigot - 1.18.1-R0.1-SNAPSHOT - remapped-mojang - provided - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..480e09f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://repo.papermc.io/repository/maven-public/") + } +} + +rootProject.name = "TerminatorPlus" +include("TerminatorPlus-Plugin") +include("TerminatorPlus-API") From b6313f6622b1ad1609a17546785d754ab54b7a12 Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 19:27:24 -0400 Subject: [PATCH 2/8] refactored almost everything into the API module, and left NMS stuff in plugin module, and performance improvements --- .../net/nuggetmc/tplus/api/AIManager.java | 5 + .../net/nuggetmc/tplus/api/BotManager.java | 50 ++++ .../nuggetmc/tplus/api/InternalBridge.java | 13 + .../net/nuggetmc/tplus/api/Terminator.java | 18 +- .../nuggetmc/tplus/api/TerminatorPlusAPI.java | 22 ++ .../net/nuggetmc/tplus/api}/agent/Agent.java | 33 +-- .../tplus/api}/agent/botagent/BotAgent.java | 28 ++- .../api}/agent/botagent/BotSituation.java | 6 +- .../agent/botagent/VerticalDisplacement.java | 2 +- .../agent/legacyagent/EnumTargetGoal.java | 2 +- .../api}/agent/legacyagent/LegacyAgent.java | 232 ++++++++---------- .../agent/legacyagent/LegacyBlockCheck.java | 41 ++-- .../api}/agent/legacyagent/LegacyItems.java | 2 +- .../api}/agent/legacyagent/LegacyLevel.java | 2 +- .../api}/agent/legacyagent/LegacyMats.java | 2 +- .../api}/agent/legacyagent/LegacyUtils.java | 16 +- .../agent/legacyagent/LegacyWorldManager.java | 2 +- .../api/agent/legacyagent/ai/BotData.java | 2 +- .../legacyagent/ai/IntelligenceAgent.java | 45 ++-- .../agent/legacyagent/ai/NeuralNetwork.java | 4 +- .../api}/event/BotDamageByPlayerEvent.java | 10 +- .../tplus/api}/event/BotDeathEvent.java | 10 +- .../tplus/api}/event/BotFallDamageEvent.java | 18 +- .../api}/event/BotKilledByPlayerEvent.java | 10 +- .../nuggetmc/tplus/api}/utils/BotUtils.java | 2 +- .../tplus/{ => api}/utils/ChatUtils.java | 2 +- .../tplus/api/utils}/CustomGameProfile.java | 3 +- .../tplus/api/utils/DebugLogUtils.java | 23 ++ .../nuggetmc/tplus/api}/utils/ItemUtils.java | 2 +- .../tplus/{ => api}/utils/MathUtils.java | 2 +- .../nuggetmc/tplus/api}/utils/MojangAPI.java | 2 +- .../tplus/api}/utils/PlayerUtils.java | 16 +- .../tplus/api}/utils/Singularity.java | 2 +- .../net/nuggetmc/tplus/TerminatorPlus.java | 13 +- .../main/java/net/nuggetmc/tplus/bot/Bot.java | 21 +- .../{BotManager.java => BotManagerImpl.java} | 81 +++--- .../tplus/bridge/InternalBridgeImpl.java | 35 +++ .../tplus/command/CommandHandler.java | 6 +- .../tplus/command/CommandInstance.java | 2 +- .../tplus/command/commands/AICommand.java | 20 +- .../tplus/command/commands/BotCommand.java | 149 ++++++----- .../tplus/command/commands/MainCommand.java | 2 +- .../net/nuggetmc/tplus/utils/Debugger.java | 74 ++---- 43 files changed, 583 insertions(+), 449 deletions(-) create mode 100644 TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/AIManager.java create mode 100644 TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java create mode 100644 TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java create mode 100644 TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/TerminatorPlusAPI.java rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/Agent.java (68%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/botagent/BotAgent.java (86%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/botagent/BotSituation.java (71%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/botagent/VerticalDisplacement.java (85%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/EnumTargetGoal.java (96%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/LegacyAgent.java (84%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/LegacyBlockCheck.java (80%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/LegacyItems.java (83%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/LegacyLevel.java (91%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/LegacyMats.java (99%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/LegacyUtils.java (53%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/LegacyWorldManager.java (89%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/agent/legacyagent/ai/IntelligenceAgent.java (88%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/event/BotDamageByPlayerEvent.java (74%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/event/BotDeathEvent.java (52%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/event/BotFallDamageEvent.java (59%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/event/BotKilledByPlayerEvent.java (64%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/utils/BotUtils.java (97%) rename TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/{ => api}/utils/ChatUtils.java (96%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils}/CustomGameProfile.java (90%) create mode 100644 TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/DebugLogUtils.java rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/utils/ItemUtils.java (97%) rename TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/{ => api}/utils/MathUtils.java (99%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/utils/MojangAPI.java (97%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/utils/PlayerUtils.java (87%) rename {TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus => TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api}/utils/Singularity.java (91%) rename TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/{BotManager.java => BotManagerImpl.java} (69%) create mode 100644 TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/AIManager.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/AIManager.java new file mode 100644 index 0000000..de3c6e2 --- /dev/null +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/AIManager.java @@ -0,0 +1,5 @@ +package net.nuggetmc.tplus.api; + +public interface AIManager { + void clearSession(); +} diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java new file mode 100644 index 0000000..71927c4 --- /dev/null +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/BotManager.java @@ -0,0 +1,50 @@ +package net.nuggetmc.tplus.api; + +import net.nuggetmc.tplus.api.agent.Agent; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; +import org.bukkit.Location; +import org.bukkit.entity.Player; + +import java.util.List; +import java.util.Set; +import java.util.UUID; + +public interface BotManager { + Set fetch(); + + Agent getAgent(); + + void add(Terminator bot); + + Terminator getFirst(String name); + + List fetchNames(); + + void createBots(Player sender, String name, String skinName, int n); + + void createBots(Player sender, String name, String skinName, int n, NeuralNetwork network); + + Set createBots(Location loc, String name, String[] skin, List networks); + + Set createBots(Location loc, String name, String[] skin, int n, NeuralNetwork network); + + void remove(Terminator bot); + + void reset(); + + /** + * Get a bot from a Player object + * + * @param player + * @return + * @deprecated Use {@link #getBot(UUID)} instead as this may no longer work + */ + @Deprecated + Terminator getBot(Player player); + + Terminator getBot(UUID uuid); + + Terminator getBot(int entityId); + + +} diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java new file mode 100644 index 0000000..35e9e27 --- /dev/null +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/InternalBridge.java @@ -0,0 +1,13 @@ +package net.nuggetmc.tplus.api; + +import org.bukkit.Sound; +import org.bukkit.block.Block; + +/** + * This class serves as a bridge between the API and internal code that interacts with NMS. + */ +public interface InternalBridge { + void sendBlockDestructionPacket(short entityId, int x, int y, int z, int progress); + + Sound breakBlockSound(Block block); +} diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java index c377524..11dc114 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java @@ -1,12 +1,12 @@ package net.nuggetmc.tplus.api; import com.mojang.authlib.GameProfile; -import net.kyori.adventure.text.Component; import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.BlockFace; import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; @@ -15,8 +15,12 @@ public interface Terminator { String getBotName(); + int getId(); + GameProfile getGameProfile(); + LivingEntity getBukkitEntity(); + NeuralNetwork getNeuralNetwork(); void setNeuralNetwork(NeuralNetwork neuralNetwork); @@ -25,6 +29,8 @@ public interface Terminator { Location getLocation(); + boolean isAlive(); + float getHealth(); float getMaxHealth(); @@ -41,6 +47,10 @@ public interface Terminator { boolean isInWater(); + boolean isOnGround(); + + void setXRot(float pitch); + void jump(Vector velocity); void jump(); @@ -49,6 +59,8 @@ public interface Terminator { void look(BlockFace face); + void faceLocation(Location location); + void attack(Entity target); void attemptBlockPlace(Location loc, Material type, boolean down); @@ -88,4 +100,8 @@ public interface Terminator { int getAliveTicks(); boolean tickDelay(int ticks); + + void renderBot(Object packetListener, boolean login); + + void setOnFirePackets(boolean onFire); } diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/TerminatorPlusAPI.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/TerminatorPlusAPI.java new file mode 100644 index 0000000..0a7022d --- /dev/null +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/TerminatorPlusAPI.java @@ -0,0 +1,22 @@ +package net.nuggetmc.tplus.api; + +public class TerminatorPlusAPI { + private static InternalBridge internalBridge; + private static BotManager botManager; + + public static InternalBridge getInternalBridge() { + return internalBridge; + } + + public static void setInternalBridge(InternalBridge internalBridge) { + TerminatorPlusAPI.internalBridge = internalBridge; + } + + public static BotManager getBotManager() { + return botManager; + } + + public static void setBotManager(BotManager botManager) { + TerminatorPlusAPI.botManager = botManager; + } +} diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/Agent.java similarity index 68% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/Agent.java index 926c650..6cbcd46 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/Agent.java @@ -1,14 +1,14 @@ -package net.nuggetmc.tplus.bot.agent; +package net.nuggetmc.tplus.api.agent; -import net.nuggetmc.tplus.TerminatorPlus; -import net.nuggetmc.tplus.bot.Bot; -import net.nuggetmc.tplus.bot.BotManager; -import net.nuggetmc.tplus.bot.event.BotDamageByPlayerEvent; -import net.nuggetmc.tplus.bot.event.BotDeathEvent; -import net.nuggetmc.tplus.bot.event.BotFallDamageEvent; -import net.nuggetmc.tplus.bot.event.BotKilledByPlayerEvent; +import net.nuggetmc.tplus.api.BotManager; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.event.BotDamageByPlayerEvent; +import net.nuggetmc.tplus.api.event.BotDeathEvent; +import net.nuggetmc.tplus.api.event.BotFallDamageEvent; +import net.nuggetmc.tplus.api.event.BotKilledByPlayerEvent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitScheduler; @@ -18,7 +18,7 @@ import java.util.Set; public abstract class Agent { - protected final TerminatorPlus plugin; + protected final Plugin plugin; protected final BotManager manager; protected final BukkitScheduler scheduler; protected final Set taskList; @@ -29,8 +29,8 @@ public abstract class Agent { protected boolean drops; - public Agent(BotManager manager) { - this.plugin = TerminatorPlus.getInstance(); + public Agent(BotManager manager, Plugin plugin) { + this.plugin = plugin; this.manager = manager; this.scheduler = Bukkit.getScheduler(); this.taskList = new HashSet<>(); @@ -67,17 +67,20 @@ public abstract class Agent { protected abstract void tick(); - public void onFallDamage(BotFallDamageEvent event) { } + public void onFallDamage(BotFallDamageEvent event) { + } - public void onPlayerDamage(BotDamageByPlayerEvent event) { } + public void onPlayerDamage(BotDamageByPlayerEvent event) { + } - public void onBotDeath(BotDeathEvent event) { } + public void onBotDeath(BotDeathEvent event) { + } public void onBotKilledByPlayer(BotKilledByPlayerEvent event) { Player player = event.getPlayer(); scheduler.runTaskAsynchronously(plugin, () -> { - Bot bot = manager.getBot(player); + Terminator bot = manager.getBot(player); if (bot != null) { bot.incrementKills(); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java similarity index 86% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java index 759beb0..7ac6199 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java @@ -1,13 +1,14 @@ -package net.nuggetmc.tplus.bot.agent.botagent; +package net.nuggetmc.tplus.api.agent.botagent; -import net.nuggetmc.tplus.bot.Bot; -import net.nuggetmc.tplus.bot.BotManager; -import net.nuggetmc.tplus.bot.agent.Agent; -import net.nuggetmc.tplus.utils.MathUtils; -import net.nuggetmc.tplus.utils.PlayerUtils; +import net.nuggetmc.tplus.api.BotManager; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.Agent; +import net.nuggetmc.tplus.api.utils.MathUtils; +import net.nuggetmc.tplus.api.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; import org.bukkit.util.Vector; import java.util.Set; @@ -22,19 +23,19 @@ public class BotAgent extends Agent { private int count; - public BotAgent(BotManager manager) { - super(manager); + public BotAgent(BotManager manager, Plugin plugin) { + super(manager, plugin); } @Override protected void tick() { - Set bots = manager.fetch(); + Set bots = manager.fetch(); count = bots.size(); bots.forEach(this::tickBot); } // This is where the code starts to get spicy - private void tickBot(Bot bot) { + private void tickBot(Terminator bot) { if (!bot.isAlive()) return; Location loc = bot.getLocation(); @@ -90,13 +91,14 @@ public class BotAgent extends Agent { if (bot.tickDelay(3)) attack(bot, player, loc); } - private void attack(Bot bot, Player player, Location loc) { - if (PlayerUtils.isInvincible(player.getGameMode()) || player.getNoDamageTicks() >= 5 || loc.distance(player.getLocation()) >= 4) return; + private void attack(Terminator bot, Player player, Location loc) { + if (PlayerUtils.isInvincible(player.getGameMode()) || player.getNoDamageTicks() >= 5 || loc.distance(player.getLocation()) >= 4) + return; bot.attack(player); } - private void move(Bot bot, Player player, Location loc, Location target) { + private void move(Terminator bot, Player player, Location loc, Location target) { Vector vel = target.toVector().subtract(loc.toVector()).normalize(); if (bot.tickDelay(5)) bot.faceLocation(player.getLocation()); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotSituation.java similarity index 71% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotSituation.java index 2aded0e..f94a8d1 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotSituation.java @@ -1,6 +1,6 @@ -package net.nuggetmc.tplus.bot.agent.botagent; +package net.nuggetmc.tplus.api.agent.botagent; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; import org.bukkit.Location; public class BotSituation { @@ -11,7 +11,7 @@ public class BotSituation { * aboveGround */ - public BotSituation(Bot bot, Location target) { + public BotSituation(Terminator bot, Location target) { Location loc = bot.getLocation(); this.disp = VerticalDisplacement.fetch(loc.getBlockY(), target.getBlockY()); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/VerticalDisplacement.java similarity index 85% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/VerticalDisplacement.java index 709e679..57a3cbc 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/VerticalDisplacement.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.botagent; +package net.nuggetmc.tplus.api.agent.botagent; public enum VerticalDisplacement { AT, diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/EnumTargetGoal.java similarity index 96% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/EnumTargetGoal.java index 1380953..1f9c71e 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/EnumTargetGoal.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; import java.util.HashMap; import java.util.Map; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java similarity index 84% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java index 096cc0f..32954ed 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java @@ -1,29 +1,23 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; -import net.minecraft.core.BlockPos; -import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket; -import net.nuggetmc.tplus.bot.Bot; -import net.nuggetmc.tplus.bot.BotManager; -import net.nuggetmc.tplus.bot.agent.Agent; +import net.nuggetmc.tplus.api.BotManager; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.TerminatorPlusAPI; +import net.nuggetmc.tplus.api.agent.Agent; import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotData; import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotNode; import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; -import net.nuggetmc.tplus.bot.event.BotDamageByPlayerEvent; -import net.nuggetmc.tplus.bot.event.BotDeathEvent; -import net.nuggetmc.tplus.bot.event.BotFallDamageEvent; -import net.nuggetmc.tplus.utils.MathUtils; -import net.nuggetmc.tplus.utils.PlayerUtils; +import net.nuggetmc.tplus.api.event.BotDamageByPlayerEvent; +import net.nuggetmc.tplus.api.event.BotDeathEvent; +import net.nuggetmc.tplus.api.event.BotFallDamageEvent; +import net.nuggetmc.tplus.api.utils.MathUtils; +import net.nuggetmc.tplus.api.utils.PlayerUtils; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer; -import org.bukkit.entity.Boat; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Mob; -import org.bukkit.entity.Monster; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; +import org.bukkit.entity.*; import org.bukkit.inventory.ItemStack; +import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; @@ -31,72 +25,70 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.regex.Pattern; // Yes, this code is very unoptimized, I know. public class LegacyAgent extends Agent { + private static final Pattern NAME_PATTERN = Pattern.compile("[^A-Za-z]+"); + public final Set noFace = new HashSet<>(); + public final Set noJump = new HashSet<>(); + public final Set slow = new HashSet<>(); private final LegacyBlockCheck blockCheck; - - private EnumTargetGoal goal; - - public boolean offsets = true; - - public LegacyAgent(BotManager manager) { - super(manager); - - this.goal = EnumTargetGoal.NEAREST_VULNERABLE_PLAYER; - this.blockCheck = new LegacyBlockCheck(this); - } - - private final Map miningAnim = new HashMap<>(); + private final Map miningAnim = new HashMap<>(); private final Set boats = new HashSet<>(); - - private final Map btList = new HashMap<>(); - private final Map btCheck = new HashMap<>(); - private final Map towerList = new HashMap<>(); - - private final Set boatCooldown = new HashSet<>(); + private final Map btList = new HashMap<>(); + private final Map btCheck = new HashMap<>(); + private final Map towerList = new HashMap<>(); + private final Set boatCooldown = new HashSet<>(); private final Map crackList = new HashMap<>(); private final Map mining = new HashMap<>(); + private final Set fallDamageCooldown = new HashSet<>(); + public boolean offsets = true; + private EnumTargetGoal goal; - private final Set fallDamageCooldown = new HashSet<>(); + public LegacyAgent(BotManager manager, Plugin plugin) { + super(manager, plugin); - public final Set noFace = new HashSet<>(); - public final Set noJump = new HashSet<>(); + this.goal = EnumTargetGoal.NEAREST_VULNERABLE_PLAYER; + this.blockCheck = new LegacyBlockCheck(this, plugin); + } - public final Set slow = new HashSet<>(); + private static boolean checkSideBreak(Material type) { + return !LegacyMats.BREAK.contains(type);// && !LegacyMats.LEAVES.contains(type); + } @Override protected void tick() { manager.fetch().forEach(this::tickBot); } - private void center(Bot bot) { + private void center(Terminator bot) { if (bot == null || !bot.isAlive()) { return; } - final Player botPlayer = bot.getBukkitEntity(); + final LivingEntity botEntity = bot.getBukkitEntity(); Location prev = null; - if (btList.containsKey(botPlayer)) { - prev = btList.get(botPlayer); + if (btList.containsKey(botEntity)) { + prev = btList.get(botEntity); } - Location loc = botPlayer.getLocation(); + Location loc = botEntity.getLocation(); if (prev != null) { if (loc.getBlockX() == prev.getBlockX() && loc.getBlockZ() == prev.getBlockZ()) { - btCheck.put(botPlayer, true); + btCheck.put(botEntity, true); } else { - btCheck.put(botPlayer, false); + btCheck.put(botEntity, false); } } - btList.put(botPlayer, loc); + btList.put(botEntity, loc); } - private void tickBot(Bot bot) { + private void tickBot(Terminator bot) { if (!bot.isAlive()) { return; } @@ -118,7 +110,7 @@ public class LegacyAgent extends Agent { fallDamageCheck(bot); miscellaneousChecks(bot, livingTarget); - Player botPlayer = bot.getBukkitEntity(); + LivingEntity botPlayer = bot.getBukkitEntity(); Location target = offsets ? livingTarget.getLocation().add(bot.getOffset()) : livingTarget.getLocation(); boolean ai = bot.hasNeuralNetwork(); @@ -190,14 +182,12 @@ public class LegacyAgent extends Agent { case 2: if (!waterGround) move(bot, livingTarget, loc, target, ai); } - } - - else if (LegacyMats.WATER.contains(loc.getBlock().getType())) { + } else if (LegacyMats.WATER.contains(loc.getBlock().getType())) { swim(bot, target, botPlayer, livingTarget, LegacyMats.WATER.contains(loc.clone().add(0, -1, 0).getBlock().getType())); } } - private void move(Bot bot, LivingEntity livingTarget, Location loc, Location target, boolean ai) { + private void move(Terminator bot, LivingEntity livingTarget, Location loc, Location target, boolean ai) { Vector position = loc.toVector(); Vector vel = target.toVector().subtract(position).normalize(); @@ -259,9 +249,7 @@ public class LegacyAgent extends Agent { return; } - } - - else { + } else { boolean left = network.check(BotNode.LEFT); boolean right = network.check(BotNode.RIGHT); @@ -294,7 +282,7 @@ public class LegacyAgent extends Agent { bot.jump(vel); } - private void fallDamageCheck(Bot bot) { + private void fallDamageCheck(Terminator bot) { if (bot.isFalling()) { bot.look(BlockFace.DOWN); @@ -319,7 +307,7 @@ public class LegacyAgent extends Agent { @Override public void onPlayerDamage(BotDamageByPlayerEvent event) { - Bot bot = event.getBot(); + Terminator bot = event.getBot(); Location loc = bot.getLocation(); Player player = event.getPlayer(); @@ -333,7 +321,7 @@ public class LegacyAgent extends Agent { @Override public void onFallDamage(BotFallDamageEvent event) { - Bot bot = event.getBot(); + Terminator bot = event.getBot(); World world = bot.getBukkitEntity().getWorld(); bot.look(BlockFace.DOWN); @@ -380,8 +368,10 @@ public class LegacyAgent extends Agent { } } - private void swim(Bot bot, Location loc, Player playerNPC, LivingEntity target, boolean anim) { - playerNPC.setSneaking(false); + private void swim(Terminator bot, Location loc, LivingEntity playerNPC, LivingEntity target, boolean anim) { + if (playerNPC instanceof Player) { + ((Player) playerNPC).setSneaking(false); + } Location at = bot.getLocation(); @@ -412,8 +402,8 @@ public class LegacyAgent extends Agent { bot.addVelocity(vector); } - private void stopMining(Bot bot) { - Player playerNPC = bot.getBukkitEntity(); + private void stopMining(Terminator bot) { + LivingEntity playerNPC = bot.getBukkitEntity(); if (miningAnim.containsKey(playerNPC)) { BukkitRunnable task = miningAnim.get(playerNPC); if (task != null) { @@ -423,7 +413,7 @@ public class LegacyAgent extends Agent { } } - private byte checkSide(Bot npc, LivingEntity target, Player playerNPC) { // make it so they don't jump when checking side + private byte checkSide(Terminator npc, LivingEntity target, LivingEntity playerNPC) { // make it so they don't jump when checking side Location a = playerNPC.getEyeLocation(); Location b = target.getLocation().add(0, 1, 0); @@ -444,8 +434,8 @@ public class LegacyAgent extends Agent { } } - private LegacyLevel checkNearby(LivingEntity target, Bot npc) { - Player player = npc.getBukkitEntity(); + private LegacyLevel checkNearby(LivingEntity target, Terminator npc) { + LivingEntity player = npc.getBukkitEntity(); npc.faceLocation(target.getLocation()); @@ -508,11 +498,7 @@ public class LegacyAgent extends Agent { return level; } - private static boolean checkSideBreak(Material type) { - return !LegacyMats.BREAK.contains(type);// && !LegacyMats.LEAVES.contains(type); - } - - private boolean checkUp(Bot npc, LivingEntity target, Player playerNPC, Location loc, boolean c) { + private boolean checkUp(Terminator npc, LivingEntity target, LivingEntity playerNPC, Location loc, boolean c) { Location a = playerNPC.getLocation(); Location b = target.getLocation(); @@ -650,9 +636,10 @@ public class LegacyAgent extends Agent { return false; } - private boolean checkDown(Bot npc, Player player, Location loc, boolean c) { // possibly a looser check for c + private boolean checkDown(Terminator npc, LivingEntity player, Location loc, boolean c) { // possibly a looser check for c - if (LegacyUtils.checkFreeSpace(npc.getLocation(), loc) || LegacyUtils.checkFreeSpace(player.getEyeLocation(), loc)) return false; + if (LegacyUtils.checkFreeSpace(npc.getLocation(), loc) || LegacyUtils.checkFreeSpace(player.getEyeLocation(), loc)) + return false; if (c && npc.getLocation().getBlockY() > loc.getBlockY() + 1) { Block block = npc.getLocation().add(0, -1, 0).getBlock(); @@ -661,9 +648,7 @@ public class LegacyAgent extends Agent { downMine(npc, player, block); preBreak(npc, player, block, LegacyLevel.BELOW); return true; - } - - else { + } else { Location a = loc.clone(); Location b = player.getLocation(); @@ -684,7 +669,7 @@ public class LegacyAgent extends Agent { } } - private void downMine(Bot npc, Player player, Block block) { + private void downMine(Terminator npc, LivingEntity player, Block block) { if (!LegacyMats.NO_CRACK.contains(block.getType())) { Location locBlock = player.getLocation(); locBlock.setX(locBlock.getBlockX() + 0.5); @@ -719,7 +704,7 @@ public class LegacyAgent extends Agent { } } - private boolean checkFence(Bot bot, Block block, Player player) { + private boolean checkFence(Terminator bot, Block block, LivingEntity player) { if (LegacyMats.FENCE.contains(block.getType())) { preBreak(bot, player, block, LegacyLevel.AT_D); return true; @@ -728,7 +713,7 @@ public class LegacyAgent extends Agent { return false; } - private boolean checkAt(Bot bot, Block block, Player player) { + private boolean checkAt(Terminator bot, Block block, LivingEntity player) { if (LegacyMats.BREAK.contains(block.getType())) { return false; } else { @@ -737,7 +722,7 @@ public class LegacyAgent extends Agent { } } - private void preBreak(Bot bot, Player player, Block block, LegacyLevel level) { + private void preBreak(Terminator bot, LivingEntity player, Block block, LegacyLevel level) { Material item; Material type = block.getType(); @@ -768,7 +753,7 @@ public class LegacyAgent extends Agent { @Override public void run() { - bot.punch(); + bot.punch(); } }; @@ -780,7 +765,7 @@ public class LegacyAgent extends Agent { blockBreakEffect(player, block, level); } - private void blockBreakEffect(Player player, Block block, LegacyLevel level) { + private void blockBreakEffect(LivingEntity player, Block block, LegacyLevel level) { if (LegacyMats.NO_CRACK.contains(block.getType())) return; @@ -832,26 +817,10 @@ public class LegacyAgent extends Agent { // wow this repeated code is so bad lmao - if (player.isDead()) { + if (player.isDead() || (!block.equals(cur) || block.getType() != cur.getType())) { this.cancel(); - ClientboundBlockDestructionPacket crack = new ClientboundBlockDestructionPacket(crackList.get(block), new BlockPos(block.getX(), block.getY(), block.getZ()), -1); - for (Player all : Bukkit.getOnlinePlayers()) { - ((CraftPlayer) all).getHandle().connection.send(crack); - } - - crackList.remove(block); - mining.remove(this); - return; - } - - if (!block.equals(cur) || block.getType() != cur.getType()) { - this.cancel(); - - ClientboundBlockDestructionPacket crack = new ClientboundBlockDestructionPacket(crackList.get(block), new BlockPos(block.getX(), block.getY(), block.getZ()), -1); - for (Player all : Bukkit.getOnlinePlayers()) { - ((CraftPlayer) all).getHandle().connection.send(crack); - } + TerminatorPlusAPI.getInternalBridge().sendBlockDestructionPacket(crackList.get(block), block.getX(), block.getY(), block.getZ(), -1); crackList.remove(block); mining.remove(this); @@ -863,13 +832,12 @@ public class LegacyAgent extends Agent { if (i == 9) { this.cancel(); - ClientboundBlockDestructionPacket crack = new ClientboundBlockDestructionPacket(crackList.get(block), new BlockPos(block.getX(), block.getY(), block.getZ()), -1); - for (Player all : Bukkit.getOnlinePlayers()) { - ((CraftPlayer) all).getHandle().connection.send(crack); - } + TerminatorPlusAPI.getInternalBridge().sendBlockDestructionPacket(crackList.get(block), block.getX(), block.getY(), block.getZ(), -1); + if (sound != null) { - for (Player all : Bukkit.getOnlinePlayers()) all.playSound(block.getLocation(), sound, SoundCategory.BLOCKS, 1, 1); + for (Player all : Bukkit.getOnlinePlayers()) + all.playSound(block.getLocation(), sound, SoundCategory.BLOCKS, 1, 1); } block.breakNaturally(); @@ -888,15 +856,14 @@ public class LegacyAgent extends Agent { } if (sound != null) { - for (Player all : Bukkit.getOnlinePlayers()) all.playSound(block.getLocation(), sound, SoundCategory.BLOCKS, (float) 0.3, 1); + for (Player all : Bukkit.getOnlinePlayers()) + all.playSound(block.getLocation(), sound, SoundCategory.BLOCKS, (float) 0.3, 1); } - if (block.getType() == Material.BARRIER || block.getType() == Material.BEDROCK || block.getType() == Material.END_PORTAL_FRAME) return; + if (block.getType() == Material.BARRIER || block.getType() == Material.BEDROCK || block.getType() == Material.END_PORTAL_FRAME) + return; - ClientboundBlockDestructionPacket crack = new ClientboundBlockDestructionPacket(crackList.get(block), new BlockPos(block.getX(), block.getY(), block.getZ()), i); - for (Player all : Bukkit.getOnlinePlayers()) { - ((CraftPlayer) all).getHandle().connection.send(crack); - } + TerminatorPlusAPI.getInternalBridge().sendBlockDestructionPacket(crackList.get(block), block.getX(), block.getY(), block.getZ(), i); mining.put(this, (byte) (i + 1)); } @@ -909,7 +876,7 @@ public class LegacyAgent extends Agent { } } - private void placeWaterDown(Bot bot, World world, Location loc) { + private void placeWaterDown(Terminator bot, World world, Location loc) { if (loc.getBlock().getType() == Material.WATER) return; bot.look(BlockFace.DOWN); @@ -930,8 +897,8 @@ public class LegacyAgent extends Agent { }, 5); } - private void miscellaneousChecks(Bot bot, LivingEntity target) { - Player botPlayer = bot.getBukkitEntity(); + private void miscellaneousChecks(Terminator bot, LivingEntity target) { + LivingEntity botPlayer = bot.getBukkitEntity(); World world = botPlayer.getWorld(); String worldName = world.getName(); Location loc = bot.getLocation(); @@ -1076,7 +1043,7 @@ public class LegacyAgent extends Agent { } } - private void resetHand(Bot npc, LivingEntity target, Player playerNPC) { + private void resetHand(Terminator npc, LivingEntity target, LivingEntity playerNPC) { if (!noFace.contains(npc)) { // LESSLAG if there is no if statement here npc.faceLocation(target.getLocation()); } @@ -1094,7 +1061,7 @@ public class LegacyAgent extends Agent { npc.setItem(null); } - private boolean onBoat(Player player) { + private boolean onBoat(LivingEntity player) { Set cache = new HashSet<>(); boolean check = false; @@ -1118,8 +1085,9 @@ public class LegacyAgent extends Agent { return check; } - private void attack(Bot bot, LivingEntity target, Location loc) { - if ((target instanceof Player && PlayerUtils.isInvincible(((Player) target).getGameMode())) || target.getNoDamageTicks() >= 5 || loc.distance(target.getLocation()) >= 4) return; + private void attack(Terminator bot, LivingEntity target, Location loc) { + if ((target instanceof Player && PlayerUtils.isInvincible(((Player) target).getGameMode())) || target.getNoDamageTicks() >= 5 || loc.distance(target.getLocation()) >= 4) + return; bot.attack(target); } @@ -1128,7 +1096,7 @@ public class LegacyAgent extends Agent { this.goal = goal; } - public LivingEntity locateTarget(Bot bot, Location loc) { + public LivingEntity locateTarget(Terminator bot, Location loc) { LivingEntity result = null; switch (goal) { @@ -1168,7 +1136,7 @@ public class LegacyAgent extends Agent { case NEAREST_MOB: { for (LivingEntity entity : bot.getBukkitEntity().getWorld().getLivingEntities()) { if (entity instanceof Mob && validateCloserEntity(entity, loc, result)) { - result = entity; + result = entity; } } @@ -1176,9 +1144,9 @@ public class LegacyAgent extends Agent { } case NEAREST_BOT: { - for (Bot otherBot : manager.fetch()) { + for (Terminator otherBot : manager.fetch()) { if (bot != otherBot) { - Player player = otherBot.getBukkitEntity(); + LivingEntity player = otherBot.getBukkitEntity(); if (validateCloserEntity(player, loc, result)) { result = player; @@ -1190,13 +1158,13 @@ public class LegacyAgent extends Agent { } case NEAREST_BOT_DIFFER: { - String name = bot.getName().getString(); + String name = bot.getBotName(); - for (Bot otherBot : manager.fetch()) { + for (Terminator otherBot : manager.fetch()) { if (bot != otherBot) { - Player player = otherBot.getBukkitEntity(); + LivingEntity player = otherBot.getBukkitEntity(); - if (!name.equals(otherBot.getName()) && validateCloserEntity(player, loc, result)) { + if (!name.equals(otherBot.getBotName()) && validateCloserEntity(player, loc, result)) { result = player; } } @@ -1206,13 +1174,13 @@ public class LegacyAgent extends Agent { } case NEAREST_BOT_DIFFER_ALPHA: { - String name = bot.getName().getString().replaceAll("[^A-Za-z]+", ""); + String name = NAME_PATTERN.matcher(bot.getBotName()).replaceAll(""); - for (Bot otherBot : manager.fetch()) { + for (Terminator otherBot : manager.fetch()) { if (bot != otherBot) { - Player player = otherBot.getBukkitEntity(); + LivingEntity player = otherBot.getBukkitEntity(); - if (!name.equals(otherBot.getName().getString().replaceAll("[^A-Za-z]+", "")) && validateCloserEntity(player, loc, result)) { + if (!name.equals(NAME_PATTERN.matcher(otherBot.getBotName()).replaceAll("")) && validateCloserEntity(player, loc, result)) { result = player; } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyBlockCheck.java similarity index 80% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyBlockCheck.java index 543390c..a9c2d12 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyBlockCheck.java @@ -1,13 +1,13 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; -import net.nuggetmc.tplus.TerminatorPlus; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.bukkit.plugin.Plugin; import java.util.Arrays; import java.util.HashSet; @@ -15,17 +15,18 @@ import java.util.Set; public class LegacyBlockCheck { - private final TerminatorPlus plugin; + private final Plugin plugin; private final LegacyAgent agent; - public LegacyBlockCheck(LegacyAgent agent) { - this.plugin = TerminatorPlus.getInstance(); + public LegacyBlockCheck(LegacyAgent agent, Plugin plugin) { + this.plugin = plugin; this.agent = agent; } - private void placeFinal(Bot bot, Player player, Location loc) { + private void placeFinal(Terminator bot, LivingEntity player, Location loc) { if (loc.getBlock().getType() != Material.COBBLESTONE) { - for (Player all : Bukkit.getOnlinePlayers()) all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); + for (Player all : Bukkit.getOnlinePlayers()) + all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); bot.setItem(new ItemStack(Material.COBBLESTONE)); loc.getBlock().setType(Material.COBBLESTONE); @@ -36,7 +37,7 @@ public class LegacyBlockCheck { } } - public void placeBlock(Bot bot, Player player, Block block) { + public void placeBlock(Terminator bot, LivingEntity player, Block block) { Location loc = block.getLocation(); @@ -116,23 +117,26 @@ public class LegacyBlockCheck { Bukkit.getScheduler().runTaskLater(plugin, () -> { Block b2 = loc.clone().add(0, -1, 0).getBlock(); if (LegacyMats.SPAWN.contains(b2.getType())) { - for (Player all : Bukkit.getOnlinePlayers()) all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); + for (Player all : Bukkit.getOnlinePlayers()) + all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); placeFinal(bot, player, b2.getLocation()); } }, 1); Bukkit.getScheduler().runTaskLater(plugin, () -> { - for (Player all : Bukkit.getOnlinePlayers()) all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); + for (Player all : Bukkit.getOnlinePlayers()) + all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); placeFinal(bot, player, block.getLocation()); }, 3); return; } - for (Player all : Bukkit.getOnlinePlayers()) all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); + for (Player all : Bukkit.getOnlinePlayers()) + all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); placeFinal(bot, player, block.getLocation()); } - public void clutch(Bot bot, LivingEntity target) { + public void clutch(Terminator bot, LivingEntity target) { Location botLoc = bot.getLocation(); Material type = botLoc.clone().add(0, -1, 0).getBlock().getType(); @@ -144,10 +148,10 @@ public class LegacyBlockCheck { Location loc = botLoc.clone().add(0, -1, 0); Set face = new HashSet<>(Arrays.asList( - loc.clone().add(1, 0, 0).getBlock(), - loc.clone().add(-1, 0, 0).getBlock(), - loc.clone().add(0, 0, 1).getBlock(), - loc.clone().add(0, 0, -1).getBlock() + loc.clone().add(1, 0, 0).getBlock(), + loc.clone().add(-1, 0, 0).getBlock(), + loc.clone().add(0, 0, 1).getBlock(), + loc.clone().add(0, 0, -1).getBlock() )); Location at = null; @@ -181,7 +185,8 @@ public class LegacyBlockCheck { bot.punch(); bot.sneak(); - for (Player all : Bukkit.getOnlinePlayers()) all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); + for (Player all : Bukkit.getOnlinePlayers()) + all.playSound(loc, Sound.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 1, 1); bot.setItem(new ItemStack(Material.COBBLESTONE)); loc.getBlock().setType(Material.COBBLESTONE); } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyItems.java similarity index 83% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyItems.java index c2edda4..2b307d5 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyItems.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; import org.bukkit.Material; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyLevel.java similarity index 91% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyLevel.java index e0a89f2..b4f622e 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyLevel.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; import java.util.Arrays; import java.util.HashSet; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyMats.java similarity index 99% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyMats.java index c3e2b8f..53b2a5e 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyMats.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; import org.bukkit.Material; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyUtils.java similarity index 53% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyUtils.java index 4ce0cef..d7c00b7 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyUtils.java @@ -1,13 +1,9 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.state.BlockState; +import net.nuggetmc.tplus.api.TerminatorPlusAPI; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; import org.bukkit.util.Vector; public class LegacyUtils { @@ -36,12 +32,6 @@ public class LegacyUtils { } public static Sound breakBlockSound(Block block) { - Level nmsWorld = ((CraftWorld) block.getWorld()).getHandle(); - BlockState blockState = nmsWorld.getBlockState(new BlockPos(block.getX(), block.getY(), block.getZ())); - net.minecraft.world.level.block.Block nmsBlock = blockState.getBlock(); - - SoundType soundEffectType = nmsBlock.getSoundType(blockState); - - return Sound.valueOf( soundEffectType.getBreakSound().getLocation().getPath().replace(".", "_").toUpperCase()); + return TerminatorPlusAPI.getInternalBridge().breakBlockSound(block); } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyWorldManager.java similarity index 89% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyWorldManager.java index 549d3ed..45c67af 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyWorldManager.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent; +package net.nuggetmc.tplus.api.agent.legacyagent; import org.bukkit.Location; import org.bukkit.Material; diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java index c4f1bc2..fa66f27 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java @@ -1,7 +1,7 @@ package net.nuggetmc.tplus.api.agent.legacyagent.ai; import net.nuggetmc.tplus.api.Terminator; -import net.nuggetmc.tplus.utils.MathUtils; +import net.nuggetmc.tplus.api.utils.MathUtils; import org.apache.commons.lang.StringUtils; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java similarity index 88% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java index c6d4086..cdcd3cd 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java @@ -1,25 +1,20 @@ -package net.nuggetmc.tplus.bot.agent.legacyagent.ai; +package net.nuggetmc.tplus.api.agent.legacyagent.ai; -import net.minecraft.world.entity.LivingEntity; -import net.nuggetmc.tplus.TerminatorPlus; +import net.nuggetmc.tplus.api.AIManager; +import net.nuggetmc.tplus.api.BotManager; import net.nuggetmc.tplus.api.Terminator; -import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotDataType; -import net.nuggetmc.tplus.api.agent.legacyagent.ai.BotNode; -import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; -import net.nuggetmc.tplus.bot.Bot; -import net.nuggetmc.tplus.bot.BotManager; -import net.nuggetmc.tplus.bot.agent.legacyagent.EnumTargetGoal; -import net.nuggetmc.tplus.bot.agent.legacyagent.LegacyAgent; -import net.nuggetmc.tplus.command.commands.AICommand; -import net.nuggetmc.tplus.utils.ChatUtils; -import net.nuggetmc.tplus.utils.MathUtils; -import net.nuggetmc.tplus.utils.MojangAPI; -import net.nuggetmc.tplus.utils.PlayerUtils; +import net.nuggetmc.tplus.api.agent.legacyagent.EnumTargetGoal; +import net.nuggetmc.tplus.api.agent.legacyagent.LegacyAgent; +import net.nuggetmc.tplus.api.utils.ChatUtils; +import net.nuggetmc.tplus.api.utils.MathUtils; +import net.nuggetmc.tplus.api.utils.MojangAPI; +import net.nuggetmc.tplus.api.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitScheduler; import java.text.NumberFormat; @@ -36,9 +31,9 @@ public class IntelligenceAgent { * default anchor location, /ai relocateanchor */ - private final TerminatorPlus plugin; + private final Plugin plugin; private final BotManager manager; - private final AICommand aiManager; + private final AIManager aiManager; private final BukkitScheduler scheduler; private LegacyAgent agent; @@ -51,7 +46,7 @@ public class IntelligenceAgent { private final String botSkin; private final int cutoff; - private final Map bots; + private final Map bots; private int populationSize; private int generation; @@ -61,9 +56,9 @@ public class IntelligenceAgent { private final Set users; private final Map>>> genProfiles; - public IntelligenceAgent(AICommand aiManager, int populationSize, String name, String skin) { - this.plugin = TerminatorPlus.getInstance(); - this.manager = plugin.getManager(); + public IntelligenceAgent(AIManager aiManager, int populationSize, String name, String skin, Plugin plugin, BotManager manager) { + this.plugin = plugin; + this.manager = manager; this.aiManager = aiManager; this.scheduler = Bukkit.getScheduler(); this.name = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss").format(Calendar.getInstance().getTime()); @@ -126,7 +121,7 @@ public class IntelligenceAgent { Location loc = PlayerUtils.findAbove(primary.getLocation(), 20); scheduler.runTask(plugin, () -> { - Set bots; + Set bots; if (loadedProfiles == null) { bots = manager.createBots(loc, botName, skinData, populationSize, NeuralNetwork.RANDOM); @@ -145,7 +140,7 @@ public class IntelligenceAgent { } bots.forEach(bot -> { - String name = bot.getName().getString(); + String name = bot.getBotName(); while (this.bots.containsKey(name)) { name += "_"; @@ -249,7 +244,7 @@ public class IntelligenceAgent { } private int aliveCount() { - return (int) bots.values().stream().filter(LivingEntity::isAlive).count(); + return (int) bots.values().stream().filter(Terminator::isAlive).count(); } private void close() { @@ -331,7 +326,7 @@ public class IntelligenceAgent { if (!bots.isEmpty()) { print("Removing all cached bots..."); - bots.values().forEach(Bot::removeVisually); + bots.values().forEach(Terminator::removeVisually); bots.clear(); } diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NeuralNetwork.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NeuralNetwork.java index 087e7cd..3e4d638 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NeuralNetwork.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/NeuralNetwork.java @@ -1,8 +1,8 @@ package net.nuggetmc.tplus.api.agent.legacyagent.ai; import net.md_5.bungee.api.ChatColor; -import net.nuggetmc.tplus.utils.MathUtils; -import net.nuggetmc.tplus.utils.ChatUtils; +import net.nuggetmc.tplus.api.utils.ChatUtils; +import net.nuggetmc.tplus.api.utils.MathUtils; import org.apache.commons.lang.StringUtils; import java.util.*; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotDamageByPlayerEvent.java similarity index 74% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotDamageByPlayerEvent.java index eeea05c..ee7886f 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotDamageByPlayerEvent.java @@ -1,24 +1,24 @@ -package net.nuggetmc.tplus.bot.event; +package net.nuggetmc.tplus.api.event; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; import org.bukkit.entity.Player; public class BotDamageByPlayerEvent { - private final Bot bot; + private final Terminator bot; private final Player player; private float damage; private boolean cancelled; - public BotDamageByPlayerEvent(Bot bot, Player player, float damage) { + public BotDamageByPlayerEvent(Terminator bot, Player player, float damage) { this.bot = bot; this.player = player; this.damage = damage; } - public Bot getBot() { + public Terminator getBot() { return bot; } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotDeathEvent.java similarity index 52% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotDeathEvent.java index 9a1cceb..cd407ce 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotDeathEvent.java @@ -1,18 +1,18 @@ -package net.nuggetmc.tplus.bot.event; +package net.nuggetmc.tplus.api.event; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; import org.bukkit.event.entity.EntityDeathEvent; public class BotDeathEvent extends EntityDeathEvent { - private final Bot bot; + private final Terminator bot; - public BotDeathEvent(EntityDeathEvent event, Bot bot) { + public BotDeathEvent(EntityDeathEvent event, Terminator bot) { super(event.getEntity(), event.getDrops(), event.getDroppedExp()); this.bot = bot; } - public Bot getBot() { + public Terminator getBot() { return bot; } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotFallDamageEvent.java similarity index 59% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotFallDamageEvent.java index 4b710d6..d46f7d3 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotFallDamageEvent.java @@ -1,26 +1,26 @@ -package net.nuggetmc.tplus.bot.event; +package net.nuggetmc.tplus.api.event; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; public class BotFallDamageEvent { - private final Bot bot; + private final Terminator bot; private boolean cancelled; - public BotFallDamageEvent(Bot bot) { + public BotFallDamageEvent(Terminator bot) { this.bot = bot; } - public Bot getBot() { + public Terminator getBot() { return bot; } - public void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } - public boolean isCancelled() { return cancelled; } + + public void setCancelled(boolean cancelled) { + this.cancelled = cancelled; + } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotKilledByPlayerEvent.java similarity index 64% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotKilledByPlayerEvent.java index 5c2d0ee..be1845f 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/event/BotKilledByPlayerEvent.java @@ -1,6 +1,6 @@ -package net.nuggetmc.tplus.bot.event; +package net.nuggetmc.tplus.api.event; -import net.nuggetmc.tplus.bot.Bot; +import net.nuggetmc.tplus.api.Terminator; import org.bukkit.entity.Player; public class BotKilledByPlayerEvent { @@ -8,15 +8,15 @@ public class BotKilledByPlayerEvent { // eventually also call this event for deaths from other damage causes within combat time // (like hitting the ground too hard) - private final Bot bot; + private final Terminator bot; private final Player player; - public BotKilledByPlayerEvent(Bot bot, Player player) { + public BotKilledByPlayerEvent(Terminator bot, Player player) { this.bot = bot; this.player = player; } - public Bot getBot() { + public Terminator getBot() { return bot; } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/BotUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/BotUtils.java similarity index 97% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/BotUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/BotUtils.java index 8956f75..6349309 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/BotUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/BotUtils.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.utils; +package net.nuggetmc.tplus.api.utils; import org.bukkit.Location; import org.bukkit.Material; diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/ChatUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ChatUtils.java similarity index 96% rename from TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/ChatUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ChatUtils.java index 73623cb..3c7cd4b 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/ChatUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ChatUtils.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.utils; +package net.nuggetmc.tplus.api.utils; import net.md_5.bungee.api.ChatColor; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/CustomGameProfile.java similarity index 90% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/CustomGameProfile.java index 037f702..d7ac2fb 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/CustomGameProfile.java @@ -1,8 +1,7 @@ -package net.nuggetmc.tplus.bot; +package net.nuggetmc.tplus.api.utils; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; -import net.nuggetmc.tplus.utils.MojangAPI; import java.util.UUID; diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/DebugLogUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/DebugLogUtils.java new file mode 100644 index 0000000..c2b6d8f --- /dev/null +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/DebugLogUtils.java @@ -0,0 +1,23 @@ +package net.nuggetmc.tplus.api.utils; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.permissions.ServerOperator; + +import java.util.Arrays; + +public class DebugLogUtils { + public static final String PREFIX = ChatColor.YELLOW + "[DEBUG] " + ChatColor.RESET; + + public static void log(Object... objects) { + String[] values = fromStringArray(objects); + String message = PREFIX + String.join(" ", values); + + Bukkit.getConsoleSender().sendMessage(message); + Bukkit.getOnlinePlayers().stream().filter(ServerOperator::isOp).forEach(p -> p.sendMessage(message)); + } + + public static String[] fromStringArray(Object[] objects) { + return Arrays.stream(objects).map(String::valueOf).toArray(String[]::new); + } +} diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ItemUtils.java similarity index 97% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ItemUtils.java index 7b8b691..c582351 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ItemUtils.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.utils; +package net.nuggetmc.tplus.api.utils; import org.bukkit.inventory.ItemStack; diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/MathUtils.java similarity index 99% rename from TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/MathUtils.java index e9a8dee..a064d77 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/utils/MathUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/MathUtils.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.utils; +package net.nuggetmc.tplus.api.utils; import net.nuggetmc.tplus.api.Terminator; import org.bukkit.util.NumberConversions; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/MojangAPI.java similarity index 97% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/MojangAPI.java index f38996c..2c81f1c 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/MojangAPI.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.utils; +package net.nuggetmc.tplus.api.utils; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/PlayerUtils.java similarity index 87% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/PlayerUtils.java index 002a851..909bdd9 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/PlayerUtils.java @@ -1,6 +1,6 @@ -package net.nuggetmc.tplus.utils; +package net.nuggetmc.tplus.api.utils; -import net.nuggetmc.tplus.TerminatorPlus; +import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.json.simple.JSONArray; @@ -15,12 +15,12 @@ import java.util.Set; public class PlayerUtils { + private static final Set USERNAME_CACHE = new HashSet<>(); + public static boolean isInvincible(GameMode mode) { return mode != GameMode.SURVIVAL && mode != GameMode.ADVENTURE && mode != null; } - private static final Set USERNAME_CACHE = new HashSet<>(); - public static String randomName() { if (USERNAME_CACHE.isEmpty()) { fillUsernameCache(); @@ -30,7 +30,7 @@ public class PlayerUtils { } public static void fillUsernameCache() { - String file = TerminatorPlus.getInstance().getServer().getWorldContainer().getAbsolutePath(); + String file = Bukkit.getServer().getWorldContainer().getAbsolutePath(); file = file.substring(0, file.length() - 1) + "usercache.json"; JSONParser parser = new JSONParser(); @@ -44,10 +44,8 @@ public class PlayerUtils { USERNAME_CACHE.add(username); } - } - - catch (IOException | ParseException e) { - Debugger.log("Failed to fetch from the usercache."); + } catch (IOException | ParseException e) { + DebugLogUtils.log("Failed to fetch from the usercache."); } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Singularity.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/Singularity.java similarity index 91% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Singularity.java rename to TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/Singularity.java index a336821..e649a83 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Singularity.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/Singularity.java @@ -1,4 +1,4 @@ -package net.nuggetmc.tplus.utils; +package net.nuggetmc.tplus.api.utils; public class Singularity { diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java index 4637b25..b217a5e 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java @@ -1,6 +1,8 @@ package net.nuggetmc.tplus; -import net.nuggetmc.tplus.bot.BotManager; +import net.nuggetmc.tplus.api.TerminatorPlusAPI; +import net.nuggetmc.tplus.bot.BotManagerImpl; +import net.nuggetmc.tplus.bridge.InternalBridgeImpl; import net.nuggetmc.tplus.command.CommandHandler; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; @@ -12,7 +14,7 @@ public class TerminatorPlus extends JavaPlugin { private static TerminatorPlus instance; private static String version; - private BotManager manager; + private BotManagerImpl manager; private CommandHandler handler; public static TerminatorPlus getInstance() { @@ -23,7 +25,7 @@ public class TerminatorPlus extends JavaPlugin { return version; } - public BotManager getManager() { + public BotManagerImpl getManager() { return manager; } @@ -37,9 +39,12 @@ public class TerminatorPlus extends JavaPlugin { version = getDescription().getVersion(); // Create Instances - this.manager = new BotManager(); + this.manager = new BotManagerImpl(); this.handler = new CommandHandler(this); + TerminatorPlusAPI.setBotManager(manager); + TerminatorPlusAPI.setInternalBridge(new InternalBridgeImpl()); + // Register event listeners this.registerEvents(manager); } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java index 6340533..27e82ce 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java @@ -25,12 +25,12 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.nuggetmc.tplus.TerminatorPlus; import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.Agent; import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; -import net.nuggetmc.tplus.bot.agent.Agent; -import net.nuggetmc.tplus.bot.event.BotDamageByPlayerEvent; -import net.nuggetmc.tplus.bot.event.BotFallDamageEvent; -import net.nuggetmc.tplus.bot.event.BotKilledByPlayerEvent; -import net.nuggetmc.tplus.utils.*; +import net.nuggetmc.tplus.api.event.BotDamageByPlayerEvent; +import net.nuggetmc.tplus.api.event.BotFallDamageEvent; +import net.nuggetmc.tplus.api.event.BotKilledByPlayerEvent; +import net.nuggetmc.tplus.api.utils.*; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -71,6 +71,7 @@ public class Bot extends ServerPlayer implements Terminator { private byte groundTicks; private byte jumpTicks; private byte noFallTicks; + private Bot(MinecraftServer minecraftServer, ServerLevel worldServer, GameProfile profile) { super(minecraftServer, worldServer, profile); @@ -175,6 +176,14 @@ public class Bot extends ServerPlayer implements Terminator { render(connection, getRenderPackets(), login); } + @Override + public void renderBot(Object packetListener, boolean login) { + if (!(packetListener instanceof ServerGamePacketListenerImpl)) { + throw new IllegalArgumentException("packetListener must be a instance of ServerGamePacketListenerImpl"); + } + render((ServerGamePacketListenerImpl) packetListener, login); + } + private Packet[] getRenderPackets() { return new Packet[]{ new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, this), @@ -336,6 +345,7 @@ public class Bot extends ServerPlayer implements Terminator { fireTicks = 100; } + @Override public void setOnFirePackets(boolean onFire) { //entityData.set(new EntityDataAccessor<>(0, EntityDataSerializers.BYTE), onFire ? (byte) 1 : (byte) 0); //sendPacket(new ClientboundSetEntityDataPacket(getId(), entityData, false)); @@ -667,6 +677,7 @@ public class Bot extends ServerPlayer implements Terminator { return getBukkitEntity().getLocation(); } + @Override public void faceLocation(Location loc) { look(loc.toVector().subtract(getLocation().toVector()), false); } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManager.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java similarity index 69% rename from TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManager.java rename to TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java index b16005e..ba44692 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManager.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java @@ -1,11 +1,14 @@ package net.nuggetmc.tplus.bot; import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.nuggetmc.tplus.bot.agent.Agent; -import net.nuggetmc.tplus.bot.agent.legacyagent.LegacyAgent; +import net.nuggetmc.tplus.TerminatorPlus; +import net.nuggetmc.tplus.api.BotManager; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.Agent; +import net.nuggetmc.tplus.api.agent.legacyagent.LegacyAgent; import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; -import net.nuggetmc.tplus.bot.event.BotDeathEvent; -import net.nuggetmc.tplus.utils.MojangAPI; +import net.nuggetmc.tplus.api.event.BotDeathEvent; +import net.nuggetmc.tplus.api.utils.MojangAPI; import org.bukkit.*; import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer; import org.bukkit.entity.Entity; @@ -23,35 +26,38 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -public class BotManager implements Listener { +public class BotManagerImpl implements BotManager, Listener { private final Agent agent; - private final Set bots; + private final Set bots; private final NumberFormat numberFormat; public boolean joinMessages = false; - public BotManager() { - this.agent = new LegacyAgent(this); + public BotManagerImpl() { + this.agent = new LegacyAgent(this, TerminatorPlus.getInstance()); this.bots = ConcurrentHashMap.newKeySet(); //should fix concurrentmodificationexception this.numberFormat = NumberFormat.getInstance(Locale.US); } - public Set fetch() { + @Override + public Set fetch() { return bots; } - public void add(Bot bot) { + @Override + public void add(Terminator bot) { if (joinMessages) { - Bukkit.broadcastMessage(ChatColor.YELLOW + (bot.getName() + " joined the game")); + Bukkit.broadcastMessage(ChatColor.YELLOW + (bot.getBotName() + " joined the game")); } bots.add(bot); } - public Bot getFirst(String name) { - for (Bot bot : bots) { - if (name.equals(bot.getName())) { + @Override + public Terminator getFirst(String name) { + for (Terminator bot : bots) { + if (name.equals(bot.getBotName())) { return bot; } } @@ -59,18 +65,26 @@ public class BotManager implements Listener { return null; } + @Override public List fetchNames() { - return bots.stream().map(Bot::getName).map(component -> component.getString()).collect(Collectors.toList()); + //return bots.stream().map(Bot::getBotName).map(component -> component.getString()).collect(Collectors.toList()); + return bots.stream().map(terminator -> { + if (terminator instanceof Bot bot) return bot.getName().getString(); + else return terminator.getBotName(); + }).collect(Collectors.toList()); } + @Override public Agent getAgent() { return agent; } + @Override public void createBots(Player sender, String name, String skinName, int n) { createBots(sender, name, skinName, n, null); } + @Override public void createBots(Player sender, String name, String skinName, int n, NeuralNetwork network) { long timestamp = System.currentTimeMillis(); @@ -88,7 +102,8 @@ public class BotManager implements Listener { sender.sendMessage("Process completed (" + ChatColor.RED + ((System.currentTimeMillis() - timestamp) / 1000D) + "s" + ChatColor.RESET + ")."); } - public Set createBots(Location loc, String name, String[] skin, int n, NeuralNetwork network) { + @Override + public Set createBots(Location loc, String name, String[] skin, int n, NeuralNetwork network) { List networks = new ArrayList<>(); for (int i = 0; i < n; i++) { @@ -98,8 +113,9 @@ public class BotManager implements Listener { return createBots(loc, name, skin, networks); } - public Set createBots(Location loc, String name, String[] skin, List networks) { - Set bots = new HashSet<>(); + @Override + public Set createBots(Location loc, String name, String[] skin, List networks) { + Set bots = new HashSet<>(); World world = loc.getWorld(); int n = networks.size(); @@ -138,39 +154,38 @@ public class BotManager implements Listener { return new Vector(Math.random() - 0.5, 0.5, Math.random() - 0.5).normalize(); } - public void remove(Bot bot) { + @Override + public void remove(Terminator bot) { bots.remove(bot); } + @Override public void reset() { if (!bots.isEmpty()) { - bots.forEach(Bot::removeVisually); + bots.forEach(Terminator::removeVisually); bots.clear(); // Not always necessary, but a good security measure } agent.stopAllTasks(); } - /** - * Get a bot from a Player object - * @param player - * @deprecated Use {@link #getBot(UUID)} instead as this may no longer work - * @return - */ - @Deprecated - public Bot getBot(Player player) { // potentially memory intensive + + @Override + public Terminator getBot(Player player) { // potentially memory intensive int id = player.getEntityId(); return getBot(id); } - public Bot getBot(UUID uuid) { + @Override + public Terminator getBot(UUID uuid) { Entity entity = Bukkit.getEntity(uuid); if (entity == null) return null; return getBot(entity.getEntityId()); } - public Bot getBot(int entityId) { - for (Bot bot : bots) { + @Override + public Terminator getBot(int entityId) { + for (Terminator bot : bots) { if (bot.getId() == entityId) { return bot; } @@ -181,13 +196,13 @@ public class BotManager implements Listener { @EventHandler public void onJoin(PlayerJoinEvent event) { ServerGamePacketListenerImpl connection = ((CraftPlayer) event.getPlayer()).getHandle().connection; - bots.forEach(bot -> bot.render(connection, true)); + bots.forEach(bot -> bot.renderBot(connection, true)); } @EventHandler public void onDeath(EntityDeathEvent event) { LivingEntity bukkitEntity = event.getEntity(); - Bot bot = getBot(bukkitEntity.getEntityId()); + Terminator bot = getBot(bukkitEntity.getEntityId()); if (bot != null) { agent.onBotDeath(new BotDeathEvent(event, bot)); } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java new file mode 100644 index 0000000..6dfdb35 --- /dev/null +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java @@ -0,0 +1,35 @@ +package net.nuggetmc.tplus.bridge; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockState; +import net.nuggetmc.tplus.api.InternalBridge; +import org.bukkit.Bukkit; +import org.bukkit.Sound; +import org.bukkit.block.Block; +import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +public class InternalBridgeImpl implements InternalBridge { + @Override + public void sendBlockDestructionPacket(short entityId, int x, int y, int z, int progress) { + ClientboundBlockDestructionPacket crack = new ClientboundBlockDestructionPacket(entityId, new BlockPos(x, y, z), progress); + for (Player all : Bukkit.getOnlinePlayers()) { + ((CraftPlayer) all).getHandle().connection.send(crack); + } + } + + @Override + public Sound breakBlockSound(Block block) { + Level nmsWorld = ((CraftWorld) block.getWorld()).getHandle(); + BlockState blockState = nmsWorld.getBlockState(new BlockPos(block.getX(), block.getY(), block.getZ())); + net.minecraft.world.level.block.Block nmsBlock = blockState.getBlock(); + + SoundType soundEffectType = nmsBlock.getSoundType(blockState); + + return Sound.valueOf(soundEffectType.getBreakSound().getLocation().getPath().replace(".", "_").toUpperCase()); + } +} diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java index f915fe9..e723ba6 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java @@ -2,13 +2,13 @@ package net.nuggetmc.tplus.command; import com.google.common.collect.Sets; import net.nuggetmc.tplus.TerminatorPlus; +import net.nuggetmc.tplus.api.utils.ChatUtils; +import net.nuggetmc.tplus.api.utils.DebugLogUtils; import net.nuggetmc.tplus.command.annotation.Command; import net.nuggetmc.tplus.command.annotation.Require; import net.nuggetmc.tplus.command.commands.AICommand; import net.nuggetmc.tplus.command.commands.BotCommand; import net.nuggetmc.tplus.command.commands.MainCommand; -import net.nuggetmc.tplus.utils.ChatUtils; -import net.nuggetmc.tplus.utils.Debugger; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.command.SimpleCommandMap; @@ -62,7 +62,7 @@ public class CommandHandler { try { method.setAccessible(true); } catch (SecurityException e) { - Debugger.log("Failed to access method " + method.getName() + "."); + DebugLogUtils.log("Failed to access method " + method.getName() + "."); continue; } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java index bbfd799..5f66a5f 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java @@ -1,13 +1,13 @@ package net.nuggetmc.tplus.command; import net.md_5.bungee.api.ChatColor; +import net.nuggetmc.tplus.api.utils.ChatUtils; import net.nuggetmc.tplus.command.annotation.Arg; import net.nuggetmc.tplus.command.annotation.OptArg; import net.nuggetmc.tplus.command.annotation.TextArg; import net.nuggetmc.tplus.command.exception.ArgCountException; import net.nuggetmc.tplus.command.exception.ArgParseException; import net.nuggetmc.tplus.command.exception.NonPlayerException; -import net.nuggetmc.tplus.utils.ChatUtils; import org.apache.commons.lang.StringUtils; import org.bukkit.command.CommandSender; import org.bukkit.command.defaults.BukkitCommand; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java index 1be5f17..cc9b74f 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java @@ -1,18 +1,19 @@ package net.nuggetmc.tplus.command.commands; import net.nuggetmc.tplus.TerminatorPlus; -import net.nuggetmc.tplus.bot.Bot; -import net.nuggetmc.tplus.bot.BotManager; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.IntelligenceAgent; +import net.nuggetmc.tplus.api.AIManager; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.IntelligenceAgent; import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; +import net.nuggetmc.tplus.api.utils.ChatUtils; +import net.nuggetmc.tplus.api.utils.MathUtils; +import net.nuggetmc.tplus.bot.BotManagerImpl; import net.nuggetmc.tplus.command.CommandHandler; import net.nuggetmc.tplus.command.CommandInstance; import net.nuggetmc.tplus.command.annotation.Arg; import net.nuggetmc.tplus.command.annotation.Autofill; import net.nuggetmc.tplus.command.annotation.Command; import net.nuggetmc.tplus.command.annotation.OptArg; -import net.nuggetmc.tplus.utils.ChatUtils; -import net.nuggetmc.tplus.utils.MathUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -22,7 +23,7 @@ import org.bukkit.scheduler.BukkitScheduler; import java.util.ArrayList; import java.util.List; -public class AICommand extends CommandInstance { +public class AICommand extends CommandInstance implements AIManager { /* * ideas @@ -31,7 +32,7 @@ public class AICommand extends CommandInstance { */ private final TerminatorPlus plugin; - private final BotManager manager; + private final BotManagerImpl manager; private final BukkitScheduler scheduler; private IntelligenceAgent agent; @@ -69,7 +70,7 @@ public class AICommand extends CommandInstance { sender.sendMessage("Starting a new session..."); - agent = new IntelligenceAgent(this, populationSize, name, skin); + agent = new IntelligenceAgent(this, populationSize, name, skin, plugin, plugin.getManager()); agent.addUser(sender); } @@ -94,6 +95,7 @@ public class AICommand extends CommandInstance { scheduler.runTaskLater(plugin, () -> sender.sendMessage("The session " + ChatColor.YELLOW + name + ChatColor.RESET + " has been closed."), 10); } + @Override public void clearSession() { if (agent != null) { agent.stop(); @@ -115,7 +117,7 @@ public class AICommand extends CommandInstance { scheduler.runTaskAsynchronously(plugin, () -> { try { - Bot bot = manager.getFirst(name); + Terminator bot = manager.getFirst(name); if (bot == null) { sender.sendMessage("Could not find bot " + ChatColor.GREEN + name + ChatColor.RESET + "!"); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java index 8dfffc6..ccb6db1 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java @@ -1,18 +1,17 @@ package net.nuggetmc.tplus.command.commands; -import net.minecraft.world.entity.EquipmentSlot; import net.nuggetmc.tplus.TerminatorPlus; -import net.nuggetmc.tplus.bot.Bot; -import net.nuggetmc.tplus.bot.BotManager; -import net.nuggetmc.tplus.bot.agent.legacyagent.EnumTargetGoal; -import net.nuggetmc.tplus.bot.agent.legacyagent.LegacyAgent; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.legacyagent.EnumTargetGoal; +import net.nuggetmc.tplus.api.agent.legacyagent.LegacyAgent; +import net.nuggetmc.tplus.api.utils.ChatUtils; +import net.nuggetmc.tplus.bot.BotManagerImpl; import net.nuggetmc.tplus.command.CommandHandler; import net.nuggetmc.tplus.command.CommandInstance; import net.nuggetmc.tplus.command.annotation.Arg; import net.nuggetmc.tplus.command.annotation.Autofill; import net.nuggetmc.tplus.command.annotation.Command; import net.nuggetmc.tplus.command.annotation.OptArg; -import net.nuggetmc.tplus.utils.ChatUtils; import net.nuggetmc.tplus.utils.Debugger; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -20,6 +19,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.util.Vector; @@ -31,11 +31,11 @@ public class BotCommand extends CommandInstance { private final TerminatorPlus plugin; private final CommandHandler handler; - private final BotManager manager; + private final BotManagerImpl manager; private final LegacyAgent agent; private final BukkitScheduler scheduler; private final DecimalFormat formatter; - + private final Map armorTiers; private AICommand aiManager; public BotCommand(CommandHandler handler, String name, String description, String... aliases) { @@ -58,24 +58,24 @@ public class BotCommand extends CommandInstance { } @Command( - name = "create", - desc = "Create a bot." + name = "create", + desc = "Create a bot." ) public void create(Player sender, @Arg("name") String name, @OptArg("skin") String skin) { manager.createBots(sender, name, skin, 1); } @Command( - name = "multi", - desc = "Create multiple bots at once." + name = "multi", + desc = "Create multiple bots at once." ) public void multi(Player sender, @Arg("amount") int amount, @Arg("name") String name, @OptArg("skin") String skin) { manager.createBots(sender, name, skin, amount); } @Command( - name = "give", - desc = "Gives a specified item to all bots." + name = "give", + desc = "Gives a specified item to all bots." ) public void give(CommandSender sender, @Arg("item-name") String itemName) { Material type = Material.matchMaterial(itemName); @@ -92,56 +92,54 @@ public class BotCommand extends CommandInstance { sender.sendMessage("Successfully set the default item to " + ChatColor.YELLOW + item.getType() + ChatColor.RESET + " for all current bots."); } - private final Map armorTiers; - private void armorTierSetup() { - armorTiers.put("leather", new ItemStack[] { - new ItemStack(Material.LEATHER_BOOTS), - new ItemStack(Material.LEATHER_LEGGINGS), - new ItemStack(Material.LEATHER_CHESTPLATE), - new ItemStack(Material.LEATHER_HELMET), + armorTiers.put("leather", new ItemStack[]{ + new ItemStack(Material.LEATHER_BOOTS), + new ItemStack(Material.LEATHER_LEGGINGS), + new ItemStack(Material.LEATHER_CHESTPLATE), + new ItemStack(Material.LEATHER_HELMET), }); - armorTiers.put("chain", new ItemStack[] { - new ItemStack(Material.CHAINMAIL_BOOTS), - new ItemStack(Material.CHAINMAIL_LEGGINGS), - new ItemStack(Material.CHAINMAIL_CHESTPLATE), - new ItemStack(Material.CHAINMAIL_HELMET), + armorTiers.put("chain", new ItemStack[]{ + new ItemStack(Material.CHAINMAIL_BOOTS), + new ItemStack(Material.CHAINMAIL_LEGGINGS), + new ItemStack(Material.CHAINMAIL_CHESTPLATE), + new ItemStack(Material.CHAINMAIL_HELMET), }); - armorTiers.put("gold", new ItemStack[] { - new ItemStack(Material.GOLDEN_BOOTS), - new ItemStack(Material.GOLDEN_LEGGINGS), - new ItemStack(Material.GOLDEN_CHESTPLATE), - new ItemStack(Material.GOLDEN_HELMET), + armorTiers.put("gold", new ItemStack[]{ + new ItemStack(Material.GOLDEN_BOOTS), + new ItemStack(Material.GOLDEN_LEGGINGS), + new ItemStack(Material.GOLDEN_CHESTPLATE), + new ItemStack(Material.GOLDEN_HELMET), }); - armorTiers.put("iron", new ItemStack[] { - new ItemStack(Material.IRON_BOOTS), - new ItemStack(Material.IRON_LEGGINGS), - new ItemStack(Material.IRON_CHESTPLATE), - new ItemStack(Material.IRON_HELMET), + armorTiers.put("iron", new ItemStack[]{ + new ItemStack(Material.IRON_BOOTS), + new ItemStack(Material.IRON_LEGGINGS), + new ItemStack(Material.IRON_CHESTPLATE), + new ItemStack(Material.IRON_HELMET), }); - armorTiers.put("diamond", new ItemStack[] { - new ItemStack(Material.DIAMOND_BOOTS), - new ItemStack(Material.DIAMOND_LEGGINGS), - new ItemStack(Material.DIAMOND_CHESTPLATE), - new ItemStack(Material.DIAMOND_HELMET), + armorTiers.put("diamond", new ItemStack[]{ + new ItemStack(Material.DIAMOND_BOOTS), + new ItemStack(Material.DIAMOND_LEGGINGS), + new ItemStack(Material.DIAMOND_CHESTPLATE), + new ItemStack(Material.DIAMOND_HELMET), }); - armorTiers.put("netherite", new ItemStack[] { - new ItemStack(Material.NETHERITE_BOOTS), - new ItemStack(Material.NETHERITE_LEGGINGS), - new ItemStack(Material.NETHERITE_CHESTPLATE), - new ItemStack(Material.NETHERITE_HELMET), + armorTiers.put("netherite", new ItemStack[]{ + new ItemStack(Material.NETHERITE_BOOTS), + new ItemStack(Material.NETHERITE_LEGGINGS), + new ItemStack(Material.NETHERITE_CHESTPLATE), + new ItemStack(Material.NETHERITE_HELMET), }); } @Command( - name = "armor", - desc = "Gives all bots an armor set.", - autofill = "armorAutofill" + name = "armor", + desc = "Gives all bots an armor set.", + autofill = "armorAutofill" ) @SuppressWarnings("deprecation") public void armor(CommandSender sender, @Arg("armor-tier") String armorTier) { @@ -156,14 +154,17 @@ public class BotCommand extends CommandInstance { ItemStack[] armor = armorTiers.get(tier); manager.fetch().forEach(bot -> { - bot.getBukkitEntity().getInventory().setArmorContents(armor); - bot.getBukkitEntity().updateInventory(); + if (bot.getBukkitEntity() instanceof Player) { + Player botPlayer = (Player) bot.getBukkitEntity(); + botPlayer.getInventory().setArmorContents(armor); + botPlayer.updateInventory(); - // packet sending to ensure - bot.setItem(armor[0], EquipmentSlot.FEET); - bot.setItem(armor[1], EquipmentSlot.LEGS); - bot.setItem(armor[2], EquipmentSlot.CHEST); - bot.setItem(armor[3], EquipmentSlot.HEAD); + // packet sending to ensure + bot.setItem(armor[0], EquipmentSlot.FEET); + bot.setItem(armor[1], EquipmentSlot.LEGS); + bot.setItem(armor[2], EquipmentSlot.CHEST); + bot.setItem(armor[3], EquipmentSlot.HEAD); + } }); sender.sendMessage("Successfully set the armor tier to " + ChatColor.YELLOW + tier + ChatColor.RESET + " for all current bots."); @@ -175,9 +176,9 @@ public class BotCommand extends CommandInstance { } @Command( - name = "info", - desc = "Information about loaded bots.", - autofill = "infoAutofill" + name = "info", + desc = "Information about loaded bots.", + autofill = "infoAutofill" ) public void info(CommandSender sender, @Arg("bot-name") String name) { if (name == null) { @@ -189,7 +190,7 @@ public class BotCommand extends CommandInstance { scheduler.runTaskAsynchronously(plugin, () -> { try { - Bot bot = manager.getFirst(name); + Terminator bot = manager.getFirst(name); if (bot == null) { sender.sendMessage("Could not find bot " + ChatColor.GREEN + name + ChatColor.RESET + "!"); @@ -207,7 +208,7 @@ public class BotCommand extends CommandInstance { * neural network values (network name if loaded, otherwise RANDOM) */ - String botName = bot.getName().getString(); + String botName = bot.getBotName(); String world = ChatColor.YELLOW + bot.getBukkitEntity().getWorld().getName(); Location loc = bot.getLocation(); String strLoc = ChatColor.YELLOW + formatter.format(loc.getBlockX()) + ", " + formatter.format(loc.getBlockY()) + ", " + formatter.format(loc.getBlockZ()); @@ -220,9 +221,7 @@ public class BotCommand extends CommandInstance { sender.sendMessage(ChatUtils.BULLET_FORMATTED + "Position: " + strLoc); sender.sendMessage(ChatUtils.BULLET_FORMATTED + "Velocity: " + strVel); sender.sendMessage(ChatUtils.LINE); - } - - catch (Exception e) { + } catch (Exception e) { sender.sendMessage(ChatUtils.EXCEPTION_MESSAGE); } }); @@ -234,8 +233,8 @@ public class BotCommand extends CommandInstance { } @Command( - name = "reset", - desc = "Remove all loaded bots." + name = "reset", + desc = "Remove all loaded bots." ) public void reset(CommandSender sender) { sender.sendMessage("Removing every bot..."); @@ -257,10 +256,10 @@ public class BotCommand extends CommandInstance { * basically, in the @Command annotation, you can include a "parent" for the command, so it will be a subcommand under the specified parent */ @Command( - name = "settings", - desc = "Make changes to the global configuration file and bot-specific settings.", - aliases = "options", - autofill = "settingsAutofill" + name = "settings", + desc = "Make changes to the global configuration file and bot-specific settings.", + aliases = "options", + autofill = "settingsAutofill" ) public void settings(CommandSender sender, List args) { String arg1 = args.isEmpty() ? null : args.get(0); @@ -307,9 +306,7 @@ public class BotCommand extends CommandInstance { if (args.length == 2) { output.add("setgoal"); - } - - else if (args.length == 3) { + } else if (args.length == 3) { if (args[1].equalsIgnoreCase("setgoal")) { Arrays.stream(EnumTargetGoal.values()).forEach(goal -> output.add(goal.name().replace("_", "").toLowerCase())); } @@ -319,9 +316,9 @@ public class BotCommand extends CommandInstance { } @Command( - name = "debug", - desc = "Debug plugin code.", - visible = false + name = "debug", + desc = "Debug plugin code.", + visible = false ) public void debug(CommandSender sender, @Arg("expression") String expression) { new Debugger(sender).execute(expression); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java index 59ad796..571ef79 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java @@ -6,10 +6,10 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.hover.content.Text; import net.nuggetmc.tplus.TerminatorPlus; +import net.nuggetmc.tplus.api.utils.ChatUtils; import net.nuggetmc.tplus.command.CommandHandler; import net.nuggetmc.tplus.command.CommandInstance; import net.nuggetmc.tplus.command.annotation.Command; -import net.nuggetmc.tplus.utils.ChatUtils; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java index e091322..bc3bae7 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java @@ -1,12 +1,16 @@ package net.nuggetmc.tplus.utils; -import net.minecraft.world.entity.LivingEntity; import net.nuggetmc.tplus.TerminatorPlus; -import net.nuggetmc.tplus.bot.Bot; -import net.nuggetmc.tplus.bot.agent.Agent; -import net.nuggetmc.tplus.bot.agent.legacyagent.LegacyAgent; -import net.nuggetmc.tplus.bot.agent.legacyagent.ai.IntelligenceAgent; +import net.nuggetmc.tplus.api.Terminator; +import net.nuggetmc.tplus.api.agent.Agent; +import net.nuggetmc.tplus.api.agent.legacyagent.LegacyAgent; +import net.nuggetmc.tplus.api.agent.legacyagent.ai.IntelligenceAgent; import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; +import net.nuggetmc.tplus.api.utils.DebugLogUtils; +import net.nuggetmc.tplus.api.utils.MathUtils; +import net.nuggetmc.tplus.api.utils.MojangAPI; +import net.nuggetmc.tplus.api.utils.PlayerUtils; +import net.nuggetmc.tplus.bot.Bot; import net.nuggetmc.tplus.command.commands.AICommand; import org.bukkit.*; import org.bukkit.command.CommandSender; @@ -23,28 +27,15 @@ import java.util.stream.Collectors; public class Debugger { - private static final String PREFIX = ChatColor.YELLOW + "[DEBUG] " + ChatColor.RESET; - private final CommandSender sender; public Debugger(CommandSender sender) { this.sender = sender; } - public static void log(Object... objects) { - String[] values = formStringArray(objects); - String message = PREFIX + String.join(" ", values); - - Bukkit.getConsoleSender().sendMessage(message); - Bukkit.getOnlinePlayers().stream().filter(ServerOperator::isOp).forEach(p -> p.sendMessage(message)); - } - - private static String[] formStringArray(Object[] objects) { - return Arrays.stream(objects).map(String::valueOf).toArray(String[]::new); - } private void print(Object... objects) { - sender.sendMessage(PREFIX + String.join(" ", formStringArray(objects))); + sender.sendMessage(DebugLogUtils.PREFIX + String.join(" ", DebugLogUtils.fromStringArray(objects))); } public void execute(String cmd) { @@ -60,9 +51,7 @@ public class Debugger { Statement statement = new Statement(this, name, args); print("Running the expression \"" + ChatColor.AQUA + cmd + ChatColor.RESET + "\"..."); statement.execute(); - } - - catch (Exception e) { + } catch (Exception e) { print("Error: the expression \"" + ChatColor.AQUA + cmd + ChatColor.RESET + "\" failed to execute."); print(e.toString()); } @@ -80,11 +69,13 @@ public class Debugger { try { obj = Double.parseDouble(value); - } catch (NumberFormatException ignored) { } + } catch (NumberFormatException ignored) { + } try { obj = Integer.parseInt(value); - } catch (NumberFormatException ignored) { } + } catch (NumberFormatException ignored) { + } if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("false")) { obj = Boolean.parseBoolean(value); @@ -222,7 +213,7 @@ public class Debugger { public void tpall() { Player player = (Player) sender; - TerminatorPlus.getInstance().getManager().fetch().stream().filter(LivingEntity::isAlive).forEach(bot -> bot.getBukkitEntity().teleport(player)); + TerminatorPlus.getInstance().getManager().fetch().stream().filter(Terminator::isAlive).forEach(bot -> bot.getBukkitEntity().teleport(player)); } public void viewsession() { @@ -244,9 +235,7 @@ public class Debugger { LegacyAgent legacyAgent = (LegacyAgent) agent; legacyAgent.offsets = b; - print("Bot target offsets are now " - + (legacyAgent.offsets ? ChatColor.GREEN + "ENABLED" : ChatColor.RED + "DISABLED") - + ChatColor.RESET + "."); + print("Bot target offsets are now " + (legacyAgent.offsets ? ChatColor.GREEN + "ENABLED" : ChatColor.RED + "DISABLED") + ChatColor.RESET + "."); } public void confuse(int n) { @@ -269,12 +258,7 @@ public class Debugger { } public void dreamsmp() { - spawnBots(Arrays.asList( - "Dream", "GeorgeNotFound", "Callahan", "Sapnap", "awesamdude", "Ponk", "BadBoyHalo", "TommyInnit", "Tubbo_", "ItsFundy", "Punz", - "Purpled", "WilburSoot", "Jschlatt", "Skeppy", "The_Eret", "JackManifoldTV", "Nihachu", "Quackity", "KarlJacobs", "HBomb94", - "Technoblade", "Antfrost", "Ph1LzA", "ConnorEatsPants", "CaptainPuffy", "Vikkstar123", "LazarCodeLazar", "Ranboo", "FoolishG", - "hannahxxrose", "Slimecicle", "Michaelmcchill" - )); + spawnBots(Arrays.asList("Dream", "GeorgeNotFound", "Callahan", "Sapnap", "awesamdude", "Ponk", "BadBoyHalo", "TommyInnit", "Tubbo_", "ItsFundy", "Punz", "Purpled", "WilburSoot", "Jschlatt", "Skeppy", "The_Eret", "JackManifoldTV", "Nihachu", "Quackity", "KarlJacobs", "HBomb94", "Technoblade", "Antfrost", "Ph1LzA", "ConnorEatsPants", "CaptainPuffy", "Vikkstar123", "LazarCodeLazar", "Ranboo", "FoolishG", "hannahxxrose", "Slimecicle", "Michaelmcchill")); } private void spawnBots(List players) { @@ -319,9 +303,7 @@ public class Debugger { print("Done."); }); - } - - catch (Exception e) { + } catch (Exception e) { print(e); } }); @@ -352,14 +334,14 @@ public class Debugger { } public void tp() { - Bot bot = MathUtils.getRandomSetElement(TerminatorPlus.getInstance().getManager().fetch().stream().filter(LivingEntity::isAlive).collect(Collectors.toSet())); + Terminator bot = MathUtils.getRandomSetElement(TerminatorPlus.getInstance().getManager().fetch().stream().filter(Terminator::isAlive).collect(Collectors.toSet())); if (bot == null) { print("Failed to locate a bot."); return; } - print("Located bot", (ChatColor.GREEN.toString() + bot.getName() + ChatColor.RESET.toString() + ".")); + print("Located bot", (ChatColor.GREEN + bot.getBotName() + ChatColor.RESET + ".")); if (sender instanceof Player) { print("Teleporting..."); @@ -386,9 +368,9 @@ public class Debugger { } public void hideNametags() { // this works for some reason - Set bots = TerminatorPlus.getInstance().getManager().fetch(); + Set bots = TerminatorPlus.getInstance().getManager().fetch(); - for (Bot bot : bots) { + for (Terminator bot : bots) { Location loc = bot.getLocation(); World world = loc.getWorld(); @@ -409,9 +391,9 @@ public class Debugger { } public void sit() { - Set bots = TerminatorPlus.getInstance().getManager().fetch(); + Set bots = TerminatorPlus.getInstance().getManager().fetch(); - for (Bot bot : bots) { + for (Terminator bot : bots) { Location loc = bot.getLocation(); World world = loc.getWorld(); @@ -440,7 +422,7 @@ public class Debugger { Player player = (Player) sender; - for (Bot bot : TerminatorPlus.getInstance().getManager().fetch()) { + for (Terminator bot : TerminatorPlus.getInstance().getManager().fetch()) { bot.faceLocation(player.getEyeLocation()); } } @@ -451,8 +433,6 @@ public class Debugger { boolean b = agent.isEnabled(); agent.setEnabled(!b); - print("The Bot Agent is now " - + (b ? ChatColor.RED + "DISABLED" : ChatColor.GREEN + "ENABLED") - + ChatColor.RESET + "."); + print("The Bot Agent is now " + (b ? ChatColor.RED + "DISABLED" : ChatColor.GREEN + "ENABLED") + ChatColor.RESET + "."); } } From b89e1b13581250a53b071a876b6077558dd898ac Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 20:01:15 -0400 Subject: [PATCH 3/8] make it compile --- build.gradle.kts | 25 +++++++++++++++++++++---- src/main/resources/plugin.yml | 4 ++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d7f087e..54f4712 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,17 +2,34 @@ plugins { id("java") } -group = "net.tplus" +group = "net.nuggetmc" version = "3.1-BETA" +val jarName = "TerminatorPlus-" + version; + repositories { mavenCentral() } dependencies { - + implementation(project(":TerminatorPlus-Plugin")) + implementation(project(":TerminatorPlus-API")) } -tasks.getByName("test") { - useJUnitPlatform() +tasks.jar { + from(configurations.compileClasspath.get().map { if (it.isDirectory()) it else zipTree(it) }) + archiveFileName.set(jarName + ".jar") +} +//TODO currently, the resources are in src/main/resources, because gradle is stubborn and won't include the resources in TerminatroPlus-Plugin/src/main/resources, will need to fix + +/* +task copyPlugin(type: Copy) { + from 'build/libs/' + jarName + '.jar' + into 'run/plugins' +} + */ + +tasks.register("copyPlugin", Copy::class.java) { + from("build/libs/" + jarName + ".jar") + into("run/plugins") } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 47b5f6c..0804d01 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: TerminatorPlus main: net.nuggetmc.tplus.TerminatorPlus -version: ${project.version} +version: ${version} api-version: 1.16 author: HorseNuggets @@ -12,4 +12,4 @@ permissions: terminatorplus.manage: true terminatorplus.manage: description: Allows for TerminatorPlus bot management. - default: op \ No newline at end of file + default: op From 6610ac05db66d17cd0a836ddbd194dc800d57e74 Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 20:02:28 -0400 Subject: [PATCH 4/8] I didn't add the build scripts --- TerminatorPlus-API/build.gradle.kts | 22 +++ TerminatorPlus-Plugin/build.gradle.kts | 56 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 +++++++++++++++++++++++ gradlew.bat | 89 +++++++++ 6 files changed, 406 insertions(+) create mode 100644 TerminatorPlus-API/build.gradle.kts create mode 100644 TerminatorPlus-Plugin/build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat diff --git a/TerminatorPlus-API/build.gradle.kts b/TerminatorPlus-API/build.gradle.kts new file mode 100644 index 0000000..ca65db3 --- /dev/null +++ b/TerminatorPlus-API/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + id("java") +} + +group = "net.nuggetmc" +version = "3.1-BETA" + +repositories { + mavenCentral() + maven { + url = uri("https://repo.papermc.io/repository/maven-public/") + } + maven { + name = "minecraft-repo" + url = uri("https://libraries.minecraft.net/") + } +} + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT") + compileOnly("com.mojang:authlib:3.2.38") +} diff --git a/TerminatorPlus-Plugin/build.gradle.kts b/TerminatorPlus-Plugin/build.gradle.kts new file mode 100644 index 0000000..2ddf331 --- /dev/null +++ b/TerminatorPlus-Plugin/build.gradle.kts @@ -0,0 +1,56 @@ +plugins { + `java-library` + id("io.papermc.paperweight.userdev") version "1.3.7" +} + +group = "net.nuggetmc" +version = "3.1-BETA" +description = "TerminatorPlus" + +java { + // Configure the java toolchain. This allows gradle to auto-provision JDK 17 on systems that only have JDK 8 installed for example. + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +} + +dependencies { + paperDevBundle("1.18.1-R0.1-SNAPSHOT") + + //add the TerminatorPlus-API module + implementation(project(":TerminatorPlus-API")) + + // paperweightDevBundle("com.example.paperfork", "1.19-R0.1-SNAPSHOT") + + // You will need to manually specify the full dependency if using the groovy gradle dsl + // (paperDevBundle and paperweightDevBundle functions do not work in groovy) + // paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19-R0.1-SNAPSHOT") +} + +tasks { + // Configure reobfJar to run when invoking the build task + assemble { + dependsOn(reobfJar) + } + + compileJava { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + + // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable. + // See https://openjdk.java.net/jeps/247 for more information. + options.release.set(17) + } + javadoc { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + } + processResources { + filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything + } + + /* + reobfJar { + // This is an example of how you might change the output location for reobfJar. It's recommended not to do this + // for a variety of reasons, however it's asked frequently enough that an example of how to do it is included here. + outputJar.set(layout.buildDirectory.file("libs/PaperweightTestPlugin-${project.version}.jar")) + } + */ +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..41d9927a4d4fb3f96a785543079b8df6723c946b GIT binary patch literal 59821 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 5bfd9f9a8e85f2aaff5ac7d548fea975da05a236 Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 21:09:08 -0400 Subject: [PATCH 5/8] make build work & fix some crashes --- .../net/nuggetmc/tplus/api/Terminator.java | 8 ++++---- .../tplus/api/agent/botagent/BotAgent.java | 2 +- .../api/agent/legacyagent/LegacyAgent.java | 14 +++++++------- .../legacyagent/ai/IntelligenceAgent.java | 2 +- .../main/java/net/nuggetmc/tplus/bot/Bot.java | 18 ++++++++++++++---- .../net/nuggetmc/tplus/bot/BotManagerImpl.java | 2 +- .../net/nuggetmc/tplus/utils/Debugger.java | 4 ++-- build.gradle.kts | 4 ++-- 8 files changed, 32 insertions(+), 22 deletions(-) diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java index 11dc114..a0dddc8 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java @@ -15,7 +15,7 @@ public interface Terminator { String getBotName(); - int getId(); + int getEntityId(); GameProfile getGameProfile(); @@ -29,7 +29,7 @@ public interface Terminator { Location getLocation(); - boolean isAlive(); + boolean isBotAlive(); //Has to be named like this because paper re-obfuscates it float getHealth(); @@ -37,11 +37,11 @@ public interface Terminator { void ignite(); - boolean isOnFire(); + boolean isBotOnFire(); boolean isFalling(); - boolean isBlocking(); + boolean isBotBlocking(); void block(int length, int cooldown); diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java index 7ac6199..7f2209f 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java @@ -36,7 +36,7 @@ public class BotAgent extends Agent { // This is where the code starts to get spicy private void tickBot(Terminator bot) { - if (!bot.isAlive()) return; + if (!bot.isBotAlive()) return; Location loc = bot.getLocation(); diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java index 32954ed..f3a22d3 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java @@ -64,7 +64,7 @@ public class LegacyAgent extends Agent { } private void center(Terminator bot) { - if (bot == null || !bot.isAlive()) { + if (bot == null || !bot.isBotAlive()) { return; } @@ -89,7 +89,7 @@ public class LegacyAgent extends Agent { } private void tickBot(Terminator bot) { - if (!bot.isAlive()) { + if (!bot.isBotAlive()) { return; } @@ -227,7 +227,7 @@ public class LegacyAgent extends Agent { NeuralNetwork network = bot.getNeuralNetwork(); if (network.dynamicLR()) { - if (bot.isBlocking()) { + if (bot.isBotBlocking()) { vel.multiply(0.6); } @@ -253,7 +253,7 @@ public class LegacyAgent extends Agent { boolean left = network.check(BotNode.LEFT); boolean right = network.check(BotNode.RIGHT); - if (bot.isBlocking()) { + if (bot.isBotBlocking()) { vel.multiply(0.6); } @@ -313,7 +313,7 @@ public class LegacyAgent extends Agent { double dot = loc.toVector().subtract(player.getLocation().toVector()).normalize().dot(loc.getDirection()); - if (bot.isBlocking() && dot >= -0.1) { + if (bot.isBotBlocking() && dot >= -0.1) { player.getWorld().playSound(bot.getLocation(), Sound.ITEM_SHIELD_BLOCK, 1, 1); event.setCancelled(true); } @@ -903,7 +903,7 @@ public class LegacyAgent extends Agent { String worldName = world.getName(); Location loc = bot.getLocation(); - if (bot.isOnFire()) { + if (bot.isBotOnFire()) { if (bot.getBukkitEntity().getWorld().getEnvironment() != World.Environment.NETHER) { placeWaterDown(bot, world, loc); } @@ -1035,7 +1035,7 @@ public class LegacyAgent extends Agent { scheduler.runTaskLater(plugin, () -> { boatCooldown.remove(bot); - if (bot.isAlive()) { + if (bot.isBotAlive()) { bot.faceLocation(target.getLocation()); } }, 5); diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java index cdcd3cd..f873c93 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java @@ -244,7 +244,7 @@ public class IntelligenceAgent { } private int aliveCount() { - return (int) bots.values().stream().filter(Terminator::isAlive).count(); + return (int) bots.values().stream().filter(Terminator::isBotAlive).count(); } private void close() { diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java index 27e82ce..79b2a92 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java @@ -67,7 +67,7 @@ public class Bot extends ServerPlayer implements Terminator { private boolean removeOnDeath; private int aliveTicks; private int kills; - private byte fireTicks; + private byte fireTicks; // Fire animation isn't played? Bot still takes damage. private byte groundTicks; private byte jumpTicks; private byte noFallTicks; @@ -129,6 +129,11 @@ public class Bot extends ServerPlayer implements Terminator { return displayName; } + @Override + public int getEntityId() { + return getId(); + } + @Override public NeuralNetwork getNeuralNetwork() { return network; @@ -245,6 +250,11 @@ public class Bot extends ServerPlayer implements Terminator { Bukkit.getOnlinePlayers().forEach(p -> ((CraftPlayer) p).getHandle().connection.send(packet)); } + @Override + public boolean isBotAlive() { + return isAlive(); + } + @Override public void tick() { loadChunks(); @@ -352,7 +362,7 @@ public class Bot extends ServerPlayer implements Terminator { } @Override - public boolean isOnFire() { + public boolean isBotOnFire() { return fireTicks != 0; } @@ -395,8 +405,8 @@ public class Bot extends ServerPlayer implements Terminator { } @Override - public boolean isBlocking() { - return blocking; + public boolean isBotBlocking() { + return isBlocking(); } public void setShield(boolean enabled) { diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java index ba44692..ea283ee 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java @@ -186,7 +186,7 @@ public class BotManagerImpl implements BotManager, Listener { @Override public Terminator getBot(int entityId) { for (Terminator bot : bots) { - if (bot.getId() == entityId) { + if (bot.getEntityId() == entityId) { return bot; } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java index bc3bae7..d3a685b 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java @@ -213,7 +213,7 @@ public class Debugger { public void tpall() { Player player = (Player) sender; - TerminatorPlus.getInstance().getManager().fetch().stream().filter(Terminator::isAlive).forEach(bot -> bot.getBukkitEntity().teleport(player)); + TerminatorPlus.getInstance().getManager().fetch().stream().filter(Terminator::isBotAlive).forEach(bot -> bot.getBukkitEntity().teleport(player)); } public void viewsession() { @@ -334,7 +334,7 @@ public class Debugger { } public void tp() { - Terminator bot = MathUtils.getRandomSetElement(TerminatorPlus.getInstance().getManager().fetch().stream().filter(Terminator::isAlive).collect(Collectors.toSet())); + Terminator bot = MathUtils.getRandomSetElement(TerminatorPlus.getInstance().getManager().fetch().stream().filter(Terminator::isBotAlive).collect(Collectors.toSet())); if (bot == null) { print("Failed to locate a bot."); diff --git a/build.gradle.kts b/build.gradle.kts index 54f4712..b3c4fdd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } dependencies { - implementation(project(":TerminatorPlus-Plugin")) + implementation(project(":TerminatorPlus-Plugin", "reobf")) implementation(project(":TerminatorPlus-API")) } @@ -20,7 +20,7 @@ tasks.jar { from(configurations.compileClasspath.get().map { if (it.isDirectory()) it else zipTree(it) }) archiveFileName.set(jarName + ".jar") } -//TODO currently, the resources are in src/main/resources, because gradle is stubborn and won't include the resources in TerminatroPlus-Plugin/src/main/resources, will need to fix +//TODO currently, the resources are in src/main/resources, because gradle is stubborn and won't include the resources in TerminatorPlus-Plugin/src/main/resources, will need to fix /* task copyPlugin(type: Copy) { From 855d6ede791325502222b3891845f3a829128efd Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 21:16:00 -0400 Subject: [PATCH 6/8] fix version & also make strings use escape codes --- .../java/net/nuggetmc/tplus/api/utils/ChatUtils.java | 4 ++-- build.gradle.kts | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ChatUtils.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ChatUtils.java index 3c7cd4b..a747398 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ChatUtils.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/utils/ChatUtils.java @@ -7,8 +7,8 @@ import java.util.Locale; public class ChatUtils { public static final String LINE = ChatColor.GRAY + "------------------------------------------------"; - public static final String BULLET = "▪"; - public static final String BULLET_FORMATTED = ChatColor.GRAY + " ▪ " + ChatColor.RESET; + public static final String BULLET = "\u25AA"; + public static final String BULLET_FORMATTED = ChatColor.GRAY + " \u25AA " + ChatColor.RESET; public static final String EXCEPTION_MESSAGE = ChatColor.RED + "An exception has occured. Please try again."; public static final NumberFormat NUMBER_FORMAT = NumberFormat.getNumberInstance(Locale.US); diff --git a/build.gradle.kts b/build.gradle.kts index b3c4fdd..4522edd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,10 +16,20 @@ dependencies { implementation(project(":TerminatorPlus-API")) } +tasks.processResources { + val props = mapOf("version" to version) + inputs.properties(props) + filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything + filesMatching("plugin.yml") { + expand(props) + } +} + tasks.jar { from(configurations.compileClasspath.get().map { if (it.isDirectory()) it else zipTree(it) }) archiveFileName.set(jarName + ".jar") } + //TODO currently, the resources are in src/main/resources, because gradle is stubborn and won't include the resources in TerminatorPlus-Plugin/src/main/resources, will need to fix /* From e3533b9e9240e0369a9beebae786ccdddbf0e719 Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 22:02:52 -0400 Subject: [PATCH 7/8] fix more bugs --- .../net/nuggetmc/tplus/api/Terminator.java | 16 +++++--- .../tplus/api/agent/botagent/BotAgent.java | 2 +- .../api/agent/legacyagent/LegacyAgent.java | 14 +++---- .../api/agent/legacyagent/ai/BotData.java | 2 +- .../legacyagent/ai/IntelligenceAgent.java | 2 +- .../main/java/net/nuggetmc/tplus/bot/Bot.java | 41 +++++++++++++++---- .../tplus/command/commands/AICommand.java | 4 ++ .../net/nuggetmc/tplus/utils/Debugger.java | 12 ++++++ 8 files changed, 69 insertions(+), 24 deletions(-) diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java index a0dddc8..615b948 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java @@ -31,9 +31,9 @@ public interface Terminator { boolean isBotAlive(); //Has to be named like this because paper re-obfuscates it - float getHealth(); + float getBotHealth(); - float getMaxHealth(); + float getBotMaxHealth(); void ignite(); @@ -45,11 +45,15 @@ public interface Terminator { void block(int length, int cooldown); - boolean isInWater(); + boolean isBotInWater(); - boolean isOnGround(); + boolean isBotOnGround(); - void setXRot(float pitch); + void setBotPitch(float pitch); + + default void setBotXRot(float pitch) { + setBotPitch(pitch); + } void jump(Vector velocity); @@ -77,6 +81,8 @@ public interface Terminator { void removeVisually(); + void removeBot(); + int getKills(); void incrementKills(); diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java index 7f2209f..bac02ec 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/botagent/BotAgent.java @@ -102,7 +102,7 @@ public class BotAgent extends Agent { Vector vel = target.toVector().subtract(loc.toVector()).normalize(); if (bot.tickDelay(5)) bot.faceLocation(player.getLocation()); - if (!bot.isOnGround()) return; // calling this a second time later on + if (!bot.isBotOnGround()) return; // calling this a second time later on bot.stand(); // eventually create a memory system so packets do not have to be sent every tick bot.setItem(null); // method to check item in main hand, bot.getItemInHand() diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java index f3a22d3..4a5f1af 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyAgent.java @@ -144,7 +144,7 @@ public class LegacyAgent extends Agent { if (btCheck.containsKey(botPlayer)) sameXZ = btCheck.get(botPlayer); - if (waterGround || bot.isOnGround() || onBoat(botPlayer)) { + if (waterGround || bot.isBotOnGround() || onBoat(botPlayer)) { byte sideResult = 1; if (towerList.containsKey(botPlayer)) { @@ -192,7 +192,7 @@ public class LegacyAgent extends Agent { Vector vel = target.toVector().subtract(position).normalize(); if (bot.tickDelay(5)) bot.faceLocation(livingTarget.getLocation()); - if (!bot.isOnGround()) return; // calling this a second time later on + if (!bot.isBotOnGround()) return; // calling this a second time later on bot.stand(); // eventually create a memory system so packets do not have to be sent every tick bot.setItem(null); // method to check item in main hand, bot.getItemInHand() @@ -572,7 +572,7 @@ public class LegacyAgent extends Agent { } }, 5); - if (npc.isOnGround()) { + if (npc.isBotOnGround()) { if (target.getLocation().distance(playerNPC.getLocation()) < 16) { if (noJump.contains(playerNPC)) { @@ -593,7 +593,7 @@ public class LegacyAgent extends Agent { return true; } } else { - if (npc.isOnGround()) { + if (npc.isBotOnGround()) { Location locBlock = playerNPC.getLocation(); locBlock.setX(locBlock.getBlockX() + 0.5); locBlock.setZ(locBlock.getBlockZ() + 0.5); @@ -616,7 +616,7 @@ public class LegacyAgent extends Agent { npc.look(BlockFace.UP); preBreak(npc, playerNPC, block, LegacyLevel.ABOVE); - if (npc.isOnGround()) { + if (npc.isBotOnGround()) { Location locBlock = playerNPC.getLocation(); locBlock.setX(locBlock.getBlockX() + 0.5); locBlock.setZ(locBlock.getBlockZ() + 0.5); @@ -682,7 +682,7 @@ public class LegacyAgent extends Agent { npc.setVelocity(vector); } - if (npc.isInWater()) { + if (npc.isBotInWater()) { Location locBlock = player.getLocation(); locBlock.setX(locBlock.getBlockX() + 0.5); locBlock.setZ(locBlock.getBlockZ() + 0.5); @@ -737,7 +737,7 @@ public class LegacyAgent extends Agent { bot.setItem(new ItemStack(item)); if (level == LegacyLevel.EAST_D || level == LegacyLevel.NORTH_D || level == LegacyLevel.SOUTH_D || level == LegacyLevel.WEST_D) { - bot.setXRot(69); + bot.setBotPitch(69); scheduler.runTaskLater(plugin, () -> { btCheck.put(player, true); diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java index fa66f27..4552196 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/BotData.java @@ -20,7 +20,7 @@ public class BotData { Location a = bot.getLocation(); Location b = target.getLocation(); - float health = bot.getHealth(); + float health = bot.getBotHealth(); values.put(BotDataType.CRITICAL_HEALTH, health >= 5 ? 0 : 5D - health); values.put(BotDataType.DISTANCE_XZ, Math.sqrt(MathUtils.square(a.getX() - b.getX()) + MathUtils.square(a.getZ() - b.getZ()))); diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java index f873c93..a45b9b4 100644 --- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java +++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/ai/IntelligenceAgent.java @@ -326,7 +326,7 @@ public class IntelligenceAgent { if (!bots.isEmpty()) { print("Removing all cached bots..."); - bots.values().forEach(Terminator::removeVisually); + bots.values().forEach(Terminator::removeBot); bots.clear(); } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java index 79b2a92..42e7c7b 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java @@ -255,6 +255,16 @@ public class Bot extends ServerPlayer implements Terminator { return isAlive(); } + @Override + public float getBotHealth() { + return getHealth(); + } + + @Override + public float getBotMaxHealth() { + return getMaxHealth(); + } + @Override public void tick() { loadChunks(); @@ -412,7 +422,6 @@ public class Bot extends ServerPlayer implements Terminator { public void setShield(boolean enabled) { this.shield = enabled; - System.out.println("set shield"); setItemOffhand(new org.bukkit.inventory.ItemStack(enabled ? Material.SHIELD : Material.AIR)); } @@ -421,7 +430,7 @@ public class Bot extends ServerPlayer implements Terminator { MathUtils.clean(velocity); // TODO lag???? - if (isInWater()) { + if (isBotInWater()) { y = Math.min(velocity.getY() + 0.1, 0.1); addFriction(0.8); velocity.setY(y); @@ -440,7 +449,7 @@ public class Bot extends ServerPlayer implements Terminator { } @Override - public boolean isInWater() { + public boolean isBotInWater() { Location loc = getLocation(); for (int i = 0; i <= 2; i++) { @@ -531,7 +540,7 @@ public class Bot extends ServerPlayer implements Terminator { } @Override - public boolean isOnGround() { + public boolean isBotOnGround() { return groundTicks != 0; } @@ -552,6 +561,16 @@ public class Bot extends ServerPlayer implements Terminator { this.setDead(); } + @Override + public void removeBot() { + if (Bukkit.isPrimaryThread()) { + this.remove(RemovalReason.DISCARDED); + } else { + scheduler.runTask(plugin, () -> this.remove(RemovalReason.DISCARDED)); + } + this.removeVisually(); + } + private void removeTab() { sendPacket(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, this)); } @@ -667,7 +686,7 @@ public class Bot extends ServerPlayer implements Terminator { private void kb(Location loc1, Location loc2) { Vector vel = loc1.toVector().subtract(loc2.toVector()).setY(0).normalize().multiply(0.3); - if (isOnGround()) vel.multiply(0.8).setY(0.4); + if (isBotOnGround()) vel.multiply(0.8).setY(0.4); velocity = vel; } @@ -687,6 +706,11 @@ public class Bot extends ServerPlayer implements Terminator { return getBukkitEntity().getLocation(); } + @Override + public void setBotPitch(float pitch) { + super.setXRot(pitch); + } + @Override public void faceLocation(Location loc) { look(loc.toVector().subtract(getLocation().toVector()), false); @@ -742,7 +766,6 @@ public class Bot extends ServerPlayer implements Terminator { @Override public void setItemOffhand(org.bukkit.inventory.ItemStack item) { setItem(item, EquipmentSlot.OFFHAND); - System.out.println("set offhand"); } @Override @@ -754,15 +777,15 @@ public class Bot extends ServerPlayer implements Terminator { public void setItem(org.bukkit.inventory.ItemStack item, EquipmentSlot slot) { if (item == null) item = defaultItem; - System.out.println("set"); + //System.out.println("set"); if (slot == EquipmentSlot.MAINHAND) { getBukkitEntity().getInventory().setItemInMainHand(item); } else if (slot == EquipmentSlot.OFFHAND) { getBukkitEntity().getInventory().setItemInOffHand(item); } - System.out.println("slot = " + slot); - System.out.println("item = " + item); + //System.out.println("slot = " + slot); + //System.out.println("item = " + item); sendPacket(new ClientboundSetEquipmentPacket(getId(), new ArrayList<>(Collections.singletonList( new Pair<>(slot, CraftItemStack.asNMSCopy(item)) )))); diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java index cc9b74f..4b95949 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java @@ -63,6 +63,10 @@ public class AICommand extends CommandInstance implements AIManager { desc = "Begin an AI training session." ) public void reinforcement(Player sender, @Arg("population-size") int populationSize, @Arg("name") String name, @OptArg("skin") String skin) { + //FIXME: Sometimes, bots will become invisible, or just stop working if they're the last one alive, this has been partially fixed (invis part) see Terminator#removeBot, which removes the bot. + //This seems to fix it for the most part, but its still buggy, as the bot will sometimes still freeze + //see https://cdn.carbonhost.cloud/6201479d7b237373ab269385/screenshots/javaw_DluMN4m0FR.png + //Blocks are also not placeable where bots have died if (agent != null) { sender.sendMessage("A session is already active."); return; diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java index d3a685b..42a5caf 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java @@ -1,5 +1,6 @@ package net.nuggetmc.tplus.utils; +import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.nuggetmc.tplus.TerminatorPlus; import net.nuggetmc.tplus.api.Terminator; import net.nuggetmc.tplus.api.agent.Agent; @@ -178,6 +179,17 @@ public class Debugger { } } + public void renderBots() { + int rendered = 0; + for (Terminator fetch : TerminatorPlus.getInstance().getManager().fetch()) { + rendered++; + Bot bot = (Bot) fetch; + ServerGamePacketListenerImpl connection = bot.getBukkitEntity().getHandle().connection; + fetch.renderBot(connection, true); + } + print("Rendered " + rendered + " bots."); + } + public void lol(String name, String skinName) { String[] skin = MojangAPI.getSkin(skinName); From e9844d174865ce58b7128b3041441e167524cff6 Mon Sep 17 00:00:00 2001 From: Badbird-5907 <50347938+Badbird-5907@users.noreply.github.com> Date: Fri, 17 Jun 2022 22:19:06 -0400 Subject: [PATCH 8/8] bump version --- TerminatorPlus-API/build.gradle.kts | 2 +- TerminatorPlus-Plugin/build.gradle.kts | 2 +- build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TerminatorPlus-API/build.gradle.kts b/TerminatorPlus-API/build.gradle.kts index ca65db3..644f10d 100644 --- a/TerminatorPlus-API/build.gradle.kts +++ b/TerminatorPlus-API/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } group = "net.nuggetmc" -version = "3.1-BETA" +version = "3.2-BETA" repositories { mavenCentral() diff --git a/TerminatorPlus-Plugin/build.gradle.kts b/TerminatorPlus-Plugin/build.gradle.kts index 2ddf331..2ba9e8e 100644 --- a/TerminatorPlus-Plugin/build.gradle.kts +++ b/TerminatorPlus-Plugin/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "net.nuggetmc" -version = "3.1-BETA" +version = "3.2-BETA" description = "TerminatorPlus" java { diff --git a/build.gradle.kts b/build.gradle.kts index 4522edd..8948a51 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } group = "net.nuggetmc" -version = "3.1-BETA" +version = "3.2-BETA" val jarName = "TerminatorPlus-" + version;