make macing/shield mechanic even more OP and add testserver
Some checks failed
Compile / gradle (ubuntu-latest) (push) Has been cancelled

This commit is contained in:
Justus Wolff
2026-03-05 15:44:16 +01:00
parent eab7fc2380
commit b553e36819
310 changed files with 90910 additions and 31 deletions

View File

@@ -1,2 +1,2 @@
Command: C:\Program Files\Java\jdk-21.0.10\bin\java.exe -Xmx1G -classpath C:\Users\JUFS-STL-SECONDARY\.gradle\caches\modules-2\files-2.1\net.fabricmc\tiny-remapper\0.12.0\bfb93e1bfb66d47272ccd37ce894dcfc20ba0b6\tiny-remapper-0.12.0-fat.jar net.fabricmc.tinyremapper.Main C:\Users\JUFS-STL-SECONDARY\Desktop\terminatorplus\TerminatorPlus-Plugin\build\libs\TerminatorPlus-Plugin-4.5.1-BETA.jar C:\Users\JUFS-STL-SECONDARY\Desktop\terminatorplus\TerminatorPlus-Plugin\build\libs\TerminatorPlus-Plugin-4.5.1-BETA-reobf.jar C:\Users\JUFS-STL-SECONDARY\Desktop\terminatorplus\TerminatorPlus-Plugin\.gradle\caches\paperweight\taskCache\reobfMappings.tiny mojang spigot C:\Users\JUFS-STL-SECONDARY\Desktop\terminatorplus\TerminatorPlus-Plugin\.gradle\caches\paperweight\taskCache\mappedServerJar.jar --threads=1
[INFO] Finished after 1790.62 ms.
[INFO] Finished after 1637.01 ms.

View File

@@ -166,7 +166,6 @@ public class BotManagerImpl implements BotManager, Listener {
if (botNetwork != null) {
bot.setNeuralNetwork(botNetwork == NeuralNetwork.RANDOM ? NeuralNetwork.generateRandomNetwork() : botNetwork);
bot.setShield(true);
bot.setDefaultItem(new ItemStack(Material.WOODEN_AXE));
//bot.setRemoveOnDeath(false);
}
@@ -177,6 +176,11 @@ public class BotManagerImpl implements BotManager, Listener {
bot.setVelocity(randomVelocity().multiply(f));
}
final TerminatorPlus plugin = TerminatorPlus.getInstance();
Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
bot.setShield(true);
}, 100);
bots.add(bot);
i++;
}

View File

@@ -4,6 +4,7 @@ import com.mojang.authlib.GameProfile;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.trait.SkinTrait;
import net.minecraft.server.level.ServerPlayer;
import net.nuggetmc.tplus.TerminatorPlus;
import net.nuggetmc.tplus.api.Terminator;
import net.nuggetmc.tplus.api.agent.Agent;
@@ -17,6 +18,7 @@ import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.Waterlogged;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Damageable;
import org.bukkit.entity.Entity;
@@ -117,7 +119,7 @@ public class CitizensNPC implements Terminator {
} catch (Exception e) {
Bukkit.getServer().getLogger().warning("Failed to get skin: "+e.getMessage()+Arrays.toString(e.getStackTrace()));
}
// Register with bot manager
TerminatorPlus.getInstance().getManager().add(citizensNPC);
@@ -227,11 +229,20 @@ public class CitizensNPC implements Terminator {
private void startBlocking() {
this.blocking = true;
this.blockUse = true;
// start blocking ingame
Player bukkitPlayer = (Player)getBukkitEntity();
CraftPlayer craftPlayer = (CraftPlayer) bukkitPlayer;
ServerPlayer handle = craftPlayer.getHandle();
handle.startUsingItem(net.minecraft.world.InteractionHand.OFF_HAND);
}
private void stopBlocking(int cooldown) {
this.blocking = false;
scheduler.runTaskLater(plugin, () -> this.blockUse = false, cooldown);
Player bukkitPlayer = (Player)getBukkitEntity();
CraftPlayer craftPlayer = (CraftPlayer) bukkitPlayer;
ServerPlayer handle = craftPlayer.getHandle();
handle.stopUsingItem();
}
@Override