JUFS/Tplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored almost everything into the API module, and left NMS stuff in plugin module, and performance improvements

Browse Source
This commit is contained in:
Badbird-5907
2022-06-17 19:27:24 -04:00
parent b052a04ddb
commit b6313f6622
43 changed files with 583 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java
View File

@@ -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);
}

21
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java
View File

@@ -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);
}

81
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManager.java → TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java
View File

@@ -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<Bot> bots;
private final Set<Terminator> 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<Bot> fetch() {
@Override
public Set<Terminator> 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<String> 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<Bot> createBots(Location loc, String name, String[] skin, int n, NeuralNetwork network) {
@Override
public Set<Terminator> createBots(Location loc, String name, String[] skin, int n, NeuralNetwork network) {
List<NeuralNetwork> 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<Bot> createBots(Location loc, String name, String[] skin, List<NeuralNetwork> networks) {
Set<Bot> bots = new HashSet<>();
@Override
public Set<Terminator> createBots(Location loc, String name, String[] skin, List<NeuralNetwork> networks) {
Set<Terminator> 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));
}

32
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/CustomGameProfile.java
View File

@@ -1,32 +0,0 @@
package net.nuggetmc.tplus.bot;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import net.nuggetmc.tplus.utils.MojangAPI;
import java.util.UUID;
public class CustomGameProfile extends GameProfile {
public CustomGameProfile(UUID uuid, String name, String[] skin) {
super(uuid, name);
setSkin(skin);
}
public CustomGameProfile(UUID uuid, String name, String skinName) {
super(uuid, name);
setSkin(skinName);
}
public void setSkin(String skinName) {
setSkin(MojangAPI.getSkin(skinName));
}
public void setSkin(String[] skin) {
if (skin != null) {
getProperties().put("textures", new Property("textures", skin[0], skin[1]));
}
}
}

87
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/Agent.java
View File

@@ -1,87 +0,0 @@
package net.nuggetmc.tplus.bot.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 org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitScheduler;
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
public abstract class Agent {
protected final TerminatorPlus plugin;
protected final BotManager manager;
protected final BukkitScheduler scheduler;
protected final Set<BukkitRunnable> taskList;
protected final Random random;
protected boolean enabled;
protected int taskID;
protected boolean drops;
public Agent(BotManager manager) {
this.plugin = TerminatorPlus.getInstance();
this.manager = manager;
this.scheduler = Bukkit.getScheduler();
this.taskList = new HashSet<>();
this.random = new Random();
setEnabled(true);
}
public boolean isEnabled() {
return enabled;
}
public void setEnabled(boolean b) {
enabled = b;
if (b) {
taskID = scheduler.scheduleSyncRepeatingTask(plugin, this::tick, 0, 1);
} else {
scheduler.cancelTask(taskID);
stopAllTasks();
}
}
public void stopAllTasks() {
if (!taskList.isEmpty()) {
taskList.stream().filter(t -> !t.isCancelled()).forEach(BukkitRunnable::cancel);
taskList.clear();
}
}
public void setDrops(boolean enabled) {
this.drops = enabled;
}
protected abstract void tick();
public void onFallDamage(BotFallDamageEvent event) { }
public void onPlayerDamage(BotDamageByPlayerEvent event) { }
public void onBotDeath(BotDeathEvent event) { }
public void onBotKilledByPlayer(BotKilledByPlayerEvent event) {
Player player = event.getPlayer();
scheduler.runTaskAsynchronously(plugin, () -> {
Bot bot = manager.getBot(player);
if (bot != null) {
bot.incrementKills();
}
});
}
}

142
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotAgent.java
View File

@@ -1,142 +0,0 @@
package net.nuggetmc.tplus.bot.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 org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
import java.util.Set;
/*
* New bot agent!!!!!
* this will replace legacyagent eventually
* - basically this one will actually have A* pathfinding, whereas the legacy one only straightlines
*/
public class BotAgent extends Agent {
private int count;
public BotAgent(BotManager manager) {
super(manager);
}
@Override
protected void tick() {
Set<Bot> bots = manager.fetch();
count = bots.size();
bots.forEach(this::tickBot);
}
// This is where the code starts to get spicy
private void tickBot(Bot bot) {
if (!bot.isAlive()) return;
Location loc = bot.getLocation();
// if bot.hasHoldState() return; << This will be to check if a bot is mining or something similar where it can't move
Player player = nearestPlayer(loc);
if (player == null) return;
Location target = player.getLocation();
if (count > 1) target.add(bot.getOffset());
// Make the XZ offsets stored in the bot object (so they don't form a straight line),
// and make it so when mining and stuff, the offset is not taken into account
// if checkVertical(bot) { break block action add; return; }
BotSituation situation = new BotSituation(bot, target);
// based on the situation, the bot can perform different actions
// there can be priorities assigned
// for building up, bot.setAction(BotAction.TOWER) or bot.startBuildingUp()
VerticalDisplacement disp = situation.getVerticalDisplacement();
// Later on maybe do bot.setAction(Action.MOVE) and what not instead of hardcoding it here
// bot.setSneaking(false);
move(bot, player, loc, target);
/*if (disp == VerticalDisplacement.ABOVE) {
if (bot.isOnGround()) { // checks this twice, again during .jump()
bot.sneak();
bot.look(BlockFace.DOWN);
bot.jump();
// bot.setSneaking(true);
// delay -> block place underneath and .setSneaking(false) << check possibilities of cancelling (add a cancel system)
// catch exceptions for slabs
scheduler.runTaskLater(plugin, () -> {
if (bot.isAlive()) {
bot.setItem(new ItemStack(Material.COBBLESTONE));
bot.attemptBlockPlace(loc, Material.COBBLESTONE);
}
}, 6);
} // maybe they will be in water or something, do not make them just do nothing here
} else {
move(bot, player, loc, target);
}*/
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;
bot.attack(player);
}
private void move(Bot bot, Player player, Location loc, Location target) {
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
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()
try {
vel.add(bot.getVelocity());
} catch (IllegalArgumentException e) {
if (MathUtils.isNotFinite(vel)) {
MathUtils.clean(vel);
}
}
if (vel.length() > 1) vel.normalize();
if (loc.distance(target) <= 5) {
vel.multiply(0.3);
} else {
vel.multiply(0.4);
}
vel.setY(0.4);
bot.jump(vel);
}
private Player nearestPlayer(Location loc) {
Player result = null;
for (Player player : Bukkit.getOnlinePlayers()) {
if (PlayerUtils.isInvincible(player.getGameMode()) || loc.getWorld() != player.getWorld()) continue;
if (result == null || loc.distance(player.getLocation()) < loc.distance(result.getLocation())) {
result = player;
}
}
return result;
}
}

23
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/BotSituation.java
View File

@@ -1,23 +0,0 @@
package net.nuggetmc.tplus.bot.agent.botagent;
import net.nuggetmc.tplus.bot.Bot;
import org.bukkit.Location;
public class BotSituation {
private final VerticalDisplacement disp;
/*
* aboveGround
*/
public BotSituation(Bot bot, Location target) {
Location loc = bot.getLocation();
this.disp = VerticalDisplacement.fetch(loc.getBlockY(), target.getBlockY());
}
public VerticalDisplacement getVerticalDisplacement() {
return disp;
}
}

16
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/botagent/VerticalDisplacement.java
View File

@@ -1,16 +0,0 @@
package net.nuggetmc.tplus.bot.agent.botagent;
public enum VerticalDisplacement {
AT,
ABOVE,
BELOW;
public static VerticalDisplacement fetch(int botY, int targetY) {
int diff = botY - targetY;
if (diff >= 2) return BELOW;
if (diff <= -2) return ABOVE;
return AT;
}
}

42
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/EnumTargetGoal.java
View File

@@ -1,42 +0,0 @@
package net.nuggetmc.tplus.bot.agent.legacyagent;
import java.util.HashMap;
import java.util.Map;
public enum EnumTargetGoal {
NEAREST_VULNERABLE_PLAYER("Locate the nearest real player that is in either Survival or Adventure mode."),
NEAREST_PLAYER("Locate the nearest real online player, despite the gamemode."),
NEAREST_HOSTILE("Locate the nearest hostile entity."),
NEAREST_MOB("Locate the nearest mob."),
NEAREST_BOT("Locate the nearest bot."),
NEAREST_BOT_DIFFER("Locate the nearest bot with a different username."),
NEAREST_BOT_DIFFER_ALPHA("Locate the nearest bot with a different username after filtering out non-alpha characters."),
NONE("No target goal.");
private static final Map<String, EnumTargetGoal> VALUES = new HashMap<String, EnumTargetGoal>() {
{
this.put("none", NONE);
this.put("nearestvulnerableplayer", NEAREST_VULNERABLE_PLAYER);
this.put("nearestplayer", NEAREST_PLAYER);
this.put("nearesthostile", NEAREST_HOSTILE);
this.put("nearestmob", NEAREST_MOB);
this.put("nearestbot", NEAREST_BOT);
this.put("nearestbotdiffer", NEAREST_BOT_DIFFER);
this.put("nearestbotdifferalpha", NEAREST_BOT_DIFFER_ALPHA);
}
};
private final String description;
EnumTargetGoal(String description) {
this.description = description;
}
public static EnumTargetGoal from(String name) {
return VALUES.get(name);
}
public String description() {
return description;
}
}

1229
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyAgent.java
View File

File diff suppressed because it is too large Load Diff

190
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyBlockCheck.java
View File

@@ -1,190 +0,0 @@
package net.nuggetmc.tplus.bot.agent.legacyagent;
import net.nuggetmc.tplus.TerminatorPlus;
import net.nuggetmc.tplus.bot.Bot;
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 java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
public class LegacyBlockCheck {
private final TerminatorPlus plugin;
private final LegacyAgent agent;
public LegacyBlockCheck(LegacyAgent agent) {
this.plugin = TerminatorPlus.getInstance();
this.agent = agent;
}
private void placeFinal(Bot bot, Player 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);
bot.setItem(new ItemStack(Material.COBBLESTONE));
loc.getBlock().setType(Material.COBBLESTONE);
Block under = loc.clone().add(0, -1, 0).getBlock();
if (under.getType() == Material.LAVA) {
under.setType(Material.COBBLESTONE);
}
}
}
public void placeBlock(Bot bot, Player player, Block block) {
Location loc = block.getLocation();
Block under = loc.clone().add(0, -1, 0).getBlock();
if (LegacyMats.SPAWN.contains(under.getType())) {
placeFinal(bot, player, loc.clone().add(0, -1, 0));
Bukkit.getScheduler().runTaskLater(plugin, () -> {
placeFinal(bot, player, block.getLocation());
}, 2);
}
Set<Block> 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()));
boolean a = false;
for (Block side : face) {
if (!LegacyMats.SPAWN.contains(side.getType())) {
a = true;
}
}
if (a) {
placeFinal(bot, player, block.getLocation());
return;
}
Set<Block> edge = new HashSet<>(Arrays.asList(loc.clone().add(1, -1, 0).getBlock(),
loc.clone().add(-1, -1, 0).getBlock(),
loc.clone().add(0, -1, 1).getBlock(),
loc.clone().add(0, -1, -1).getBlock()));
boolean b = false;
for (Block side : edge) {
if (!LegacyMats.SPAWN.contains(side.getType())) {
b = true;
}
}
if (b && LegacyMats.SPAWN.contains(under.getType())) {
placeFinal(bot, player, loc.clone().add(0, -1, 0));
Bukkit.getScheduler().runTaskLater(plugin, () -> {
placeFinal(bot, player, block.getLocation());
}, 2);
return;
}
Block c1 = loc.clone().add(1, -1, 1).getBlock();
Block c2 = loc.clone().add(1, -1, -1).getBlock();
Block c3 = loc.clone().add(-1, -1, 1).getBlock();
Block c4 = loc.clone().add(-1, -1, -1).getBlock();
boolean t = false;
if (!LegacyMats.SPAWN.contains(c1.getType()) || !LegacyMats.SPAWN.contains(c2.getType())) {
Block b1 = loc.clone().add(1, -1, 0).getBlock();
if (LegacyMats.SPAWN.contains(b1.getType())) {
placeFinal(bot, player, b1.getLocation());
}
t = true;
} else if (!LegacyMats.SPAWN.contains(c3.getType()) || !LegacyMats.SPAWN.contains(c4.getType())) {
Block b1 = loc.clone().add(-1, -1, 0).getBlock();
if (LegacyMats.SPAWN.contains(b1.getType())) {
placeFinal(bot, player, b1.getLocation());
}
t = true;
}
if (t) {
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);
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);
placeFinal(bot, player, block.getLocation());
}, 3);
return;
}
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) {
Location botLoc = bot.getLocation();
Material type = botLoc.clone().add(0, -1, 0).getBlock().getType();
Material type2 = botLoc.clone().add(0, -2, 0).getBlock().getType();
if (!(LegacyMats.SPAWN.contains(type) && LegacyMats.SPAWN.contains(type2))) return;
if (target.getLocation().getBlockY() >= botLoc.getBlockY()) {
Location loc = botLoc.clone().add(0, -1, 0);
Set<Block> 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()
));
Location at = null;
for (Block side : face) {
if (!LegacyMats.SPAWN.contains(side.getType())) {
at = side.getLocation();
}
}
if (at != null) {
agent.slow.add(bot);
agent.noFace.add(bot);
Bukkit.getScheduler().runTaskLater(plugin, () -> {
bot.stand();
agent.slow.remove(bot);
}, 12);
Bukkit.getScheduler().runTaskLater(plugin, () -> {
agent.noFace.remove(bot);
}, 15);
Location faceLoc = at.clone().add(0, -1.5, 0);
bot.faceLocation(faceLoc);
bot.look(BlockFace.DOWN);
Bukkit.getScheduler().runTaskLater(plugin, () -> {
bot.faceLocation(faceLoc);
}, 1);
bot.punch();
bot.sneak();
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);
}
}
}
}

9
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyItems.java
View File

@@ -1,9 +0,0 @@
package net.nuggetmc.tplus.bot.agent.legacyagent;
import org.bukkit.Material;
public class LegacyItems {
public static final Material SHOVEL = Material.IRON_SHOVEL;
public static final Material AXE = Material.IRON_AXE;
public static final Material PICKAXE = Material.IRON_PICKAXE;
}

35
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyLevel.java
View File

@@ -1,35 +0,0 @@
package net.nuggetmc.tplus.bot.agent.legacyagent;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
public enum LegacyLevel {
ABOVE,
BELOW,
AT,
AT_D,
NORTH,
SOUTH,
EAST,
WEST,
NORTH_D,
SOUTH_D,
EAST_D,
WEST_D;
private static final Set<LegacyLevel> SIDE = new HashSet<>(Arrays.asList(
NORTH,
SOUTH,
EAST,
WEST,
NORTH_D,
SOUTH_D,
EAST_D,
WEST_D
));
public boolean isSide() {
return SIDE.contains(this);
}
}

168
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyMats.java
View File

@@ -1,168 +0,0 @@
package net.nuggetmc.tplus.bot.agent.legacyagent;
import org.bukkit.Material;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
public class LegacyMats {
public static final Set<Material> AIR = new HashSet<>(Arrays.asList(
Material.WATER,
Material.OAK_TRAPDOOR,
Material.FIRE,
Material.LAVA,
Material.SNOW,
Material.CAVE_AIR,
Material.VINE,
Material.FERN,
Material.LARGE_FERN,
Material.GRASS,
Material.TALL_GRASS,
Material.SEAGRASS,
Material.TALL_SEAGRASS,
Material.KELP,
Material.KELP_PLANT,
Material.SUNFLOWER,
Material.AIR,
Material.VOID_AIR,
Material.FIRE,
Material.SOUL_FIRE
));
public static final Set<Material> NO_CRACK = new HashSet<>(Arrays.asList(
Material.WATER,
Material.FIRE,
Material.LAVA,
Material.CAVE_AIR,
Material.SOUL_FIRE
));
public static final Set<Material> SHOVEL = new HashSet<>(Arrays.asList(
Material.DIRT,
Material.GRAVEL,
Material.SAND,
Material.SNOW
));
public static final Set<Material> AXE = new HashSet<>(Arrays.asList(
Material.OAK_PLANKS, Material.OAK_DOOR, Material.OAK_FENCE, Material.OAK_FENCE_GATE, Material.OAK_LOG, Material.OAK_PLANKS,
Material.OAK_SIGN, Material.OAK_SLAB, Material.OAK_STAIRS, Material.OAK_TRAPDOOR, Material.OAK_WALL_SIGN, Material.OAK_WOOD,
Material.DARK_OAK_PLANKS, Material.DARK_OAK_DOOR, Material.DARK_OAK_FENCE, Material.DARK_OAK_FENCE_GATE, Material.DARK_OAK_LOG, Material.DARK_OAK_PLANKS,
Material.DARK_OAK_SIGN, Material.DARK_OAK_SLAB, Material.DARK_OAK_STAIRS, Material.DARK_OAK_TRAPDOOR, Material.DARK_OAK_WALL_SIGN, Material.DARK_OAK_WOOD,
Material.ACACIA_PLANKS, Material.ACACIA_DOOR, Material.ACACIA_FENCE, Material.ACACIA_FENCE_GATE, Material.ACACIA_LOG, Material.ACACIA_PLANKS,
Material.ACACIA_SIGN, Material.ACACIA_SLAB, Material.ACACIA_STAIRS, Material.ACACIA_TRAPDOOR, Material.ACACIA_WALL_SIGN, Material.ACACIA_WOOD,
Material.BIRCH_PLANKS, Material.BIRCH_DOOR, Material.BIRCH_FENCE, Material.BIRCH_FENCE_GATE, Material.BIRCH_LOG, Material.BIRCH_PLANKS,
Material.BIRCH_SIGN, Material.BIRCH_SLAB, Material.BIRCH_STAIRS, Material.BIRCH_TRAPDOOR, Material.BIRCH_WALL_SIGN, Material.BIRCH_WOOD,
Material.JUNGLE_PLANKS, Material.JUNGLE_DOOR, Material.JUNGLE_FENCE, Material.JUNGLE_FENCE_GATE, Material.JUNGLE_LOG, Material.JUNGLE_PLANKS,
Material.JUNGLE_SIGN, Material.JUNGLE_SLAB, Material.JUNGLE_STAIRS, Material.JUNGLE_TRAPDOOR, Material.JUNGLE_WALL_SIGN, Material.JUNGLE_WOOD,
Material.SPRUCE_PLANKS, Material.SPRUCE_DOOR, Material.SPRUCE_FENCE, Material.SPRUCE_FENCE_GATE, Material.SPRUCE_LOG, Material.SPRUCE_PLANKS,
Material.SPRUCE_SIGN, Material.SPRUCE_SLAB, Material.SPRUCE_STAIRS, Material.SPRUCE_TRAPDOOR, Material.SPRUCE_WALL_SIGN, Material.SPRUCE_WOOD,
Material.CRIMSON_PLANKS, Material.CRIMSON_DOOR, Material.CRIMSON_FENCE, Material.CRIMSON_FENCE_GATE, Material.CRIMSON_PLANKS,
Material.CRIMSON_SIGN, Material.CRIMSON_SLAB, Material.CRIMSON_STAIRS, Material.CRIMSON_TRAPDOOR, Material.CRIMSON_WALL_SIGN,
Material.WARPED_PLANKS, Material.WARPED_DOOR, Material.WARPED_FENCE, Material.WARPED_FENCE_GATE, Material.WARPED_PLANKS,
Material.WARPED_SIGN, Material.WARPED_SLAB, Material.WARPED_STAIRS, Material.WARPED_TRAPDOOR, Material.WARPED_WALL_SIGN
));
public static final Set<Material> BREAK = new HashSet<>(Arrays.asList(
Material.AIR,
Material.WATER,
Material.LAVA,
Material.TALL_GRASS,
Material.SNOW,
Material.DIRT_PATH,
Material.CAVE_AIR,
Material.VINE,
Material.FERN,
Material.LARGE_FERN,
Material.SUGAR_CANE,
Material.TWISTING_VINES,
Material.WEEPING_VINES,
Material.SEAGRASS,
Material.TALL_SEAGRASS,
Material.KELP,
Material.KELP_PLANT,
Material.SUNFLOWER,
Material.FIRE,
Material.SOUL_FIRE
));
public static final Set<Material> WATER = new HashSet<>(Arrays.asList(
Material.WATER,
Material.SEAGRASS,
Material.TALL_SEAGRASS,
Material.KELP,
Material.KELP_PLANT
));
public static final Set<Material> SPAWN = new HashSet<>(Arrays.asList(
Material.AIR,
Material.TALL_GRASS,
Material.SNOW,
Material.CAVE_AIR,
Material.VINE,
Material.FERN,
Material.LARGE_FERN,
Material.SUGAR_CANE,
Material.TWISTING_VINES,
Material.WEEPING_VINES,
Material.SEAGRASS,
Material.TALL_SEAGRASS,
Material.KELP,
Material.KELP_PLANT,
Material.SUNFLOWER,
Material.FIRE,
Material.SOUL_FIRE
));
public static final Set<Material> FALL = new HashSet<>(Arrays.asList(
Material.AIR,
Material.TALL_GRASS,
Material.SNOW,
Material.CAVE_AIR,
Material.VINE,
Material.FERN,
Material.LARGE_FERN,
Material.SUGAR_CANE,
Material.TWISTING_VINES,
Material.WEEPING_VINES,
Material.SEAGRASS,
Material.TALL_SEAGRASS,
Material.KELP,
Material.KELP_PLANT,
Material.SUNFLOWER,
Material.WATER
));
public static final Set<Material> FENCE = new HashSet<>(Arrays.asList(
Material.OAK_FENCE,
Material.ACACIA_FENCE,
Material.BIRCH_FENCE,
Material.CRIMSON_FENCE,
Material.DARK_OAK_FENCE,
Material.JUNGLE_FENCE,
Material.NETHER_BRICK_FENCE,
Material.SPRUCE_FENCE,
Material.WARPED_FENCE,
Material.COBBLESTONE_WALL,
Material.ANDESITE_WALL,
Material.BLACKSTONE_WALL,
Material.BRICK_WALL,
Material.GRANITE_WALL,
Material.DIORITE_WALL,
Material.SANDSTONE_WALL,
Material.RED_SANDSTONE_WALL,
Material.RED_NETHER_BRICK_WALL,
Material.IRON_BARS,
Material.COBWEB
));
public static final Set<Material> LEAVES = new HashSet<>(Arrays.asList(
Material.BIRCH_LEAVES,
Material.DARK_OAK_LEAVES,
Material.JUNGLE_LEAVES,
Material.OAK_LEAVES,
Material.SPRUCE_LEAVES
));
}

47
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyUtils.java
View File

@@ -1,47 +0,0 @@
package net.nuggetmc.tplus.bot.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 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 {
public static boolean checkFreeSpace(Location a, Location b) {
Vector v = b.toVector().subtract(a.toVector());
int n = 32;
double m = 1 / (double) n;
double j = Math.floor(v.length() * n);
v.multiply(m / v.length());
org.bukkit.World world = a.getWorld();
if (world == null) return false;
for (int i = 0; i <= j; i++) {
Block block = world.getBlockAt((a.toVector().add(v.clone().multiply(i))).toLocation(world));
if (!LegacyMats.AIR.contains(block.getType())) {
return false;
}
}
return true;
}
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());
}
}

25
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/LegacyWorldManager.java
View File

@@ -1,25 +0,0 @@
package net.nuggetmc.tplus.bot.agent.legacyagent;
import org.bukkit.Location;
import org.bukkit.Material;
public class LegacyWorldManager {
/*
* This is where the respawning queue will be managed
*/
public static boolean aboveGround(Location loc) {
int y = 1;
while (y < 25) {
if (loc.clone().add(0, y, 0).getBlock().getType() != Material.AIR) {
return false;
}
y++;
}
return true;
}
}

348
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/agent/legacyagent/ai/IntelligenceAgent.java
View File

@@ -1,348 +0,0 @@
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;
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 org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitScheduler;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.*;
public class IntelligenceAgent {
/*
* export all agent data to the plugin folder as separate folder things
* commands /ai stop and /ai pause
* if a session with name already exists keep adding underscores
* /ai conclude or /ai finish
* default anchor location, /ai relocateanchor
*/
private final TerminatorPlus plugin;
private final BotManager manager;
private final AICommand aiManager;
private final BukkitScheduler scheduler;
private LegacyAgent agent;
private Thread thread;
private boolean active;
private final String name;
private final String botName;
private final String botSkin;
private final int cutoff;
private final Map<String, Bot> bots;
private int populationSize;
private int generation;
private Player primary;
private final Set<CommandSender> users;
private final Map<Integer, Set<Map<BotNode, Map<BotDataType, Double>>>> genProfiles;
public IntelligenceAgent(AICommand aiManager, int populationSize, String name, String skin) {
this.plugin = TerminatorPlus.getInstance();
this.manager = plugin.getManager();
this.aiManager = aiManager;
this.scheduler = Bukkit.getScheduler();
this.name = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss").format(Calendar.getInstance().getTime());
this.botName = name;
this.botSkin = skin;
this.bots = new HashMap<>();
this.users = new HashSet<>(Collections.singletonList(Bukkit.getConsoleSender()));
this.cutoff = 5;
this.genProfiles = new HashMap<>();
this.populationSize = populationSize;
this.active = true;
scheduler.runTaskAsynchronously(plugin, () -> {
thread = Thread.currentThread();
try {
task();
} catch (Exception e) {
print(e);
print("The thread has been interrupted.");
print("The session will now close.");
close();
}
});
}
private void task() throws InterruptedException {
setup();
sleep(1000);
while (active) {
runGeneration();
}
sleep(5000);
close();
}
private void runGeneration() throws InterruptedException {
generation++;
print("Starting generation " + ChatColor.RED + generation + ChatColor.RESET + "...");
sleep(2000);
String skinName = botSkin == null ? this.botName : botSkin;
print("Fetching skin data for " + ChatColor.GREEN + skinName + ChatColor.RESET + "...");
String[] skinData = MojangAPI.getSkin(skinName);
String botName = this.botName.endsWith("%") ? this.botName : this.botName + "%";
print("Creating " + (populationSize == 1 ? "new bot" : ChatColor.RED + NumberFormat.getInstance(Locale.US).format(populationSize) + ChatColor.RESET + " new bots")
+ " with name " + ChatColor.GREEN + botName.replace("%", ChatColor.LIGHT_PURPLE + "%" + ChatColor.RESET)
+ (botSkin == null ? "" : ChatColor.RESET + " and skin " + ChatColor.GREEN + botSkin)
+ ChatColor.RESET + "...");
Set<Map<BotNode, Map<BotDataType, Double>>> loadedProfiles = genProfiles.get(generation);
Location loc = PlayerUtils.findAbove(primary.getLocation(), 20);
scheduler.runTask(plugin, () -> {
Set<Bot> bots;
if (loadedProfiles == null) {
bots = manager.createBots(loc, botName, skinData, populationSize, NeuralNetwork.RANDOM);
} else {
List<NeuralNetwork> networks = new ArrayList<>();
loadedProfiles.forEach(profile -> networks.add(NeuralNetwork.createNetworkFromProfile(profile)));
if (populationSize != networks.size()) {
print("An exception has occured.");
print("The stored population size differs from the size of the stored networks.");
close();
return;
}
bots = manager.createBots(loc, botName, skinData, networks);
}
bots.forEach(bot -> {
String name = bot.getName().getString();
while (this.bots.containsKey(name)) {
name += "_";
}
this.bots.put(name, bot);
});
});
while (bots.size() != populationSize) {
sleep(1000);
}
sleep(2000);
print("The bots will now attack each other.");
agent.setTargetType(EnumTargetGoal.NEAREST_BOT);
while (aliveCount() > 1) {
sleep(1000);
}
print("Generation " + ChatColor.RED + generation + ChatColor.RESET + " has ended.");
HashMap<Terminator, Integer> values = new HashMap<>();
for (Terminator bot : bots.values()) {
values.put(bot, bot.getAliveTicks());
}
List<Map.Entry<Terminator, Integer>> sorted = MathUtils.sortByValue(values);
Set<Terminator> winners = new HashSet<>();
int i = 1;
for (Map.Entry<Terminator, Integer> entry : sorted) {
Terminator bot = entry.getKey();
boolean check = i <= cutoff;
if (check) {
print(ChatColor.GRAY + "[" + ChatColor.YELLOW + "#" + i + ChatColor.GRAY + "] " + ChatColor.GREEN + bot.getBotName()
+ ChatUtils.BULLET_FORMATTED + ChatColor.RED + bot.getKills() + " kills");
winners.add(bot);
}
i++;
}
sleep(3000);
Map<BotNode, Map<BotDataType, List<Double>>> lists = new HashMap<>();
winners.forEach(bot -> {
Map<BotNode, Map<BotDataType, Double>> data = bot.getNeuralNetwork().values();
data.forEach((nodeType, node) -> {
if (!lists.containsKey(nodeType)) {
lists.put(nodeType, new HashMap<>());
}
Map<BotDataType, List<Double>> nodeValues = lists.get(nodeType);
node.forEach((dataType, value) -> {
if (!nodeValues.containsKey(dataType)) {
nodeValues.put(dataType, new ArrayList<>());
}
nodeValues.get(dataType).add(value);
});
});
});
Set<Map<BotNode, Map<BotDataType, Double>>> profiles = new HashSet<>();
double mutationSize = Math.pow(Math.E, 2); //MathUtils.getMutationSize(generation);
for (int j = 0; j < populationSize; j++) {
Map<BotNode, Map<BotDataType, Double>> profile = new HashMap<>();
lists.forEach((nodeType, map) -> {
Map<BotDataType, Double> points = new HashMap<>();
map.forEach((dataType, dataPoints) -> {
double value = ((int) (10 * MathUtils.generateConnectionValue(dataPoints, mutationSize))) / 10D;
points.put(dataType, value);
});
profile.put(nodeType, points);
});
profiles.add(profile);
}
genProfiles.put(generation + 1, profiles);
sleep(2000);
clearBots();
agent.setTargetType(EnumTargetGoal.NONE);
}
private int aliveCount() {
return (int) bots.values().stream().filter(LivingEntity::isAlive).count();
}
private void close() {
aiManager.clearSession();
stop(); // safety call
}
public void stop() {
if (this.active) {
this.active = false;
}
if (!thread.isInterrupted()) {
this.thread.interrupt();
}
}
private void sleep(long millis) throws InterruptedException {
Thread.sleep(millis);
}
public String getName() {
return name;
}
public void addUser(CommandSender sender) {
if (users.contains(sender)) return;
users.add(sender);
print(sender.getName() + " has been added to the userlist.");
if (primary == null && sender instanceof Player) {
setPrimary((Player) sender);
}
}
public void setPrimary(Player player) {
this.primary = player;
print(player.getName() + " has been set as the primary user.");
}
private void print(Object... objects) {
String message = ChatColor.DARK_GREEN + "[REINFORCEMENT] " + ChatColor.RESET + String.join(" ", Arrays.stream(objects).map(String::valueOf).toArray(String[]::new));
users.forEach(u -> u.sendMessage(message));
// log -> ChatColor.stripColor(message);
}
private void setup() {
clearBots();
if (populationSize < cutoff) {
populationSize = cutoff;
print("The input value for the population size is lower than the cutoff (" + ChatColor.RED + cutoff + ChatColor.RESET + ")!"
+ " The new population size is " + ChatColor.RED + populationSize + ChatColor.RESET + ".");
}
if (!(manager.getAgent() instanceof LegacyAgent)) {
print("The AI manager currently only supports " + ChatColor.AQUA + "LegacyAgent" + ChatColor.RESET + ".");
close();
return;
}
agent = (LegacyAgent) manager.getAgent();
agent.setTargetType(EnumTargetGoal.NONE);
print("The bot target goal has been set to " + ChatColor.YELLOW + EnumTargetGoal.NONE.name() + ChatColor.RESET + ".");
print("Disabling target offsets...");
agent.offsets = false;
print("Disabling bot drops...");
agent.setDrops(false);
print(ChatColor.GREEN + "Setup is now complete.");
}
private void clearBots() {
if (!bots.isEmpty()) {
print("Removing all cached bots...");
bots.values().forEach(Bot::removeVisually);
bots.clear();
}
/*print("Removing all current bots...");
int size = manager.fetch().size();
manager.reset();
String formatted = NumberFormat.getNumberInstance(Locale.US).format(size);
print("Removed " + ChatColor.RED + formatted + ChatColor.RESET + " entit" + (size == 1 ? "y" : "ies") + ".");
bots.clear();*/
}
}

44
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDamageByPlayerEvent.java
View File

@@ -1,44 +0,0 @@
package net.nuggetmc.tplus.bot.event;
import net.nuggetmc.tplus.bot.Bot;
import org.bukkit.entity.Player;
public class BotDamageByPlayerEvent {
private final Bot bot;
private final Player player;
private float damage;
private boolean cancelled;
public BotDamageByPlayerEvent(Bot bot, Player player, float damage) {
this.bot = bot;
this.player = player;
this.damage = damage;
}
public Bot getBot() {
return bot;
}
public Player getPlayer() {
return player;
}
public float getDamage() {
return damage;
}
public void setDamage(float damage) {
this.damage = damage;
}
public void setCancelled(boolean cancelled) {
this.cancelled = cancelled;
}
public boolean isCancelled() {
return cancelled;
}
}

18
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotDeathEvent.java
View File

@@ -1,18 +0,0 @@
package net.nuggetmc.tplus.bot.event;
import net.nuggetmc.tplus.bot.Bot;
import org.bukkit.event.entity.EntityDeathEvent;
public class BotDeathEvent extends EntityDeathEvent {
private final Bot bot;
public BotDeathEvent(EntityDeathEvent event, Bot bot) {
super(event.getEntity(), event.getDrops(), event.getDroppedExp());
this.bot = bot;
}
public Bot getBot() {
return bot;
}
}

26
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotFallDamageEvent.java
View File

@@ -1,26 +0,0 @@
package net.nuggetmc.tplus.bot.event;
import net.nuggetmc.tplus.bot.Bot;
public class BotFallDamageEvent {
private final Bot bot;
private boolean cancelled;
public BotFallDamageEvent(Bot bot) {
this.bot = bot;
}
public Bot getBot() {
return bot;
}
public void setCancelled(boolean cancelled) {
this.cancelled = cancelled;
}
public boolean isCancelled() {
return cancelled;
}
}

26
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/event/BotKilledByPlayerEvent.java
View File

@@ -1,26 +0,0 @@
package net.nuggetmc.tplus.bot.event;
import net.nuggetmc.tplus.bot.Bot;
import org.bukkit.entity.Player;
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 Player player;
public BotKilledByPlayerEvent(Bot bot, Player player) {
this.bot = bot;
this.player = player;
}
public Bot getBot() {
return bot;
}
public Player getPlayer() {
return player;
}
}

35
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java Normal file
View File

@@ -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());
}
}

6
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java
View File

@@ -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;
}

2
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java
View File

@@ -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;

20
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/AICommand.java
View File

@@ -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 + "!");

149
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java
View File

@@ -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<String, ItemStack[]> 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<String, ItemStack[]> 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<String> 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);

2
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/MainCommand.java
View File

@@ -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;

52
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/BotUtils.java
View File

@@ -1,52 +0,0 @@
package net.nuggetmc.tplus.utils;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.util.BoundingBox;
import org.bukkit.util.Vector;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
public class BotUtils {
public static final Set<Material> NO_FALL = new HashSet<>(Arrays.asList(
Material.WATER,
Material.LAVA,
Material.TWISTING_VINES,
Material.VINE
));
public static UUID randomSteveUUID() {
UUID uuid = UUID.randomUUID();
if (uuid.hashCode() % 2 == 0) {
return uuid;
}
return randomSteveUUID();
}
public static boolean solidAt(Location loc) { // not perfect, still cuts corners of fences
Block block = loc.getBlock();
BoundingBox box = block.getBoundingBox();
Vector position = loc.toVector();
double x = position.getX();
double y = position.getY();
double z = position.getZ();
double minX = box.getMinX();
double minY = box.getMinY();
double minZ = box.getMinZ();
double maxX = box.getMaxX();
double maxY = box.getMaxY();
double maxZ = box.getMaxZ();
return x > minX && x < maxX && y > minY && y < maxY && z > minZ && z < maxZ;
}
}

74
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Debugger.java
View File

@@ -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<String> 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<Bot> bots = TerminatorPlus.getInstance().getManager().fetch();
Set<Terminator> 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<Bot> bots = TerminatorPlus.getInstance().getManager().fetch();
Set<Terminator> 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 + ".");
}
}

59
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/ItemUtils.java
View File

@@ -1,59 +0,0 @@
package net.nuggetmc.tplus.utils;
import org.bukkit.inventory.ItemStack;
public class ItemUtils {
public static double getLegacyAttackDamage(ItemStack item) {
switch (item.getType()) {
default:
return 0.25;
case WOODEN_SHOVEL:
case GOLDEN_SHOVEL:
case WOODEN_HOE:
case GOLDEN_HOE:
case STONE_HOE:
case IRON_HOE:
case DIAMOND_HOE:
case NETHERITE_HOE:
return 1;
case WOODEN_PICKAXE:
case GOLDEN_PICKAXE:
case STONE_SHOVEL:
return 2;
case WOODEN_AXE:
case GOLDEN_AXE:
case STONE_PICKAXE:
case IRON_SHOVEL:
return 3;
case WOODEN_SWORD:
case GOLDEN_SWORD:
case STONE_AXE:
case IRON_PICKAXE:
case DIAMOND_SHOVEL:
return 4;
case STONE_SWORD:
case IRON_AXE:
case DIAMOND_PICKAXE:
case NETHERITE_SHOVEL:
return 5;
case IRON_SWORD:
case DIAMOND_AXE:
case NETHERITE_PICKAXE:
return 6;
case DIAMOND_SWORD:
case NETHERITE_AXE:
return 7;
case NETHERITE_SWORD:
return 8;
}
}
}

41
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/MojangAPI.java
View File

@@ -1,41 +0,0 @@
package net.nuggetmc.tplus.utils;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
public class MojangAPI {
private static final boolean CACHE_ENABLED = false;
private static final Map<String, String[]> CACHE = new HashMap<>();
public static String[] getSkin(String name) {
if (CACHE_ENABLED && CACHE.containsKey(name)) {
return CACHE.get(name);
}
String[] values = pullFromAPI(name);
CACHE.put(name, values);
return values;
}
// CATCHING NULL ILLEGALSTATEEXCEPTION BAD!!!! eventually fix from the getAsJsonObject thingy
public static String[] pullFromAPI(String name) {
try {
String uuid = new JsonParser().parse(new InputStreamReader(new URL("https://api.mojang.com/users/profiles/minecraft/" + name)
.openStream())).getAsJsonObject().get("id").getAsString();
JsonObject property = new JsonParser()
.parse(new InputStreamReader(new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + uuid + "?unsigned=false")
.openStream())).getAsJsonObject().get("properties").getAsJsonArray().get(0).getAsJsonObject();
return new String[] {property.get("value").getAsString(), property.get("signature").getAsString()};
} catch (IOException | IllegalStateException e) {
return null;
}
}
}

88
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/PlayerUtils.java
View File

@@ -1,88 +0,0 @@
package net.nuggetmc.tplus.utils;
import net.nuggetmc.tplus.TerminatorPlus;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import java.io.FileReader;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
public class PlayerUtils {
public static boolean isInvincible(GameMode mode) {
return mode != GameMode.SURVIVAL && mode != GameMode.ADVENTURE && mode != null;
}
private static final Set<String> USERNAME_CACHE = new HashSet<>();
public static String randomName() {
if (USERNAME_CACHE.isEmpty()) {
fillUsernameCache();
}
return MathUtils.getRandomSetElement(USERNAME_CACHE);
}
public static void fillUsernameCache() {
String file = TerminatorPlus.getInstance().getServer().getWorldContainer().getAbsolutePath();
file = file.substring(0, file.length() - 1) + "usercache.json";
JSONParser parser = new JSONParser();
try {
JSONArray array = (JSONArray) parser.parse(new FileReader(file));
for (Object obj : array) {
JSONObject jsonOBJ = (JSONObject) obj;
String username = (String) jsonOBJ.get("name");
USERNAME_CACHE.add(username);
}
}
catch (IOException | ParseException e) {
Debugger.log("Failed to fetch from the usercache.");
}
}
public static Location findAbove(Location loc, int amount) {
boolean check = false;
for (int i = 0; i <= amount; i++) {
if (loc.clone().add(0, i, 0).getBlock().getType().isSolid()) {
check = true;
break;
}
}
if (check) {
return loc;
} else {
return loc.clone().add(0, amount, 0);
}
}
public static Location findBottom(Location loc) {
loc.setY(loc.getBlockY());
for (int i = 0; i < 255; i++) {
Location check = loc.clone().add(0, -i, 0);
if (check.getY() <= 0) {
break;
}
if (check.getBlock().getType().isSolid()) {
return check.add(0, 1, 0);
}
}
return loc;
}
}

26
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/utils/Singularity.java
View File

@@ -1,26 +0,0 @@
package net.nuggetmc.tplus.utils;
public class Singularity {
private Object value;
public Singularity(Object value) {
this.value = value;
}
public Singularity() {
this.value = null;
}
public Object getValue() {
return value;
}
public void setValue(Object value) {
this.value = value;
}
public boolean hasValue() {
return value != null;
}
}