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

1.20

Browse Source
This commit is contained in:
Badbird5907
2023-06-20 18:39:28 -04:00
parent 82b354e7d6
commit 22503871e2
8 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TerminatorPlus-Plugin/build.gradle.kts
View File

@@ -13,7 +13,7 @@ java {
} }
dependencies { dependencies {
paperDevBundle("1.19.3-R0.1-SNAPSHOT") paperDevBundle("1.20.1-R0.1-SNAPSHOT")
//add the TerminatorPlus-API module //add the TerminatorPlus-API module
implementation(project(":TerminatorPlus-API")) implementation(project(":TerminatorPlus-API"))

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

@@ -12,7 +12,7 @@ import java.util.Arrays;
public class TerminatorPlus extends JavaPlugin { public class TerminatorPlus extends JavaPlugin {
public static final String REQUIRED_VERSION = "1.19.3"; public static final String REQUIRED_VERSION = "1.20.1";
private static TerminatorPlus instance; private static TerminatorPlus instance;
private static String version; private static String version;

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

@@ -2,11 +2,13 @@ package net.nuggetmc.tplus.bot;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.datafixers.util.Pair; import com.mojang.datafixers.util.Pair;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import net.minecraft.network.Connection; import net.minecraft.network.Connection;
import net.minecraft.network.PacketSendListener; import net.minecraft.network.PacketSendListener;
import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow; import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.protocol.game.*; import net.minecraft.network.protocol.game.*;
import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@@ -24,6 +26,7 @@ import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import net.nuggetmc.tplus.TerminatorPlus; import net.nuggetmc.tplus.TerminatorPlus;
import net.nuggetmc.tplus.api.Terminator; 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.Agent;
import net.nuggetmc.tplus.api.agent.legacyagent.LegacyMats; import net.nuggetmc.tplus.api.agent.legacyagent.LegacyMats;
import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork; import net.nuggetmc.tplus.api.agent.legacyagent.ai.NeuralNetwork;
@@ -35,11 +38,11 @@ import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.data.Waterlogged; import org.bukkit.block.data.Waterlogged;
import org.bukkit.craftbukkit.v1_19_R2.CraftEquipmentSlot; import org.bukkit.craftbukkit.v1_20_R1.CraftEquipmentSlot;
import org.bukkit.craftbukkit.v1_19_R2.CraftServer; import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Damageable; import org.bukkit.entity.Damageable;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -49,6 +52,7 @@ import org.bukkit.util.BoundingBox;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.lang.reflect.Field;
import java.util.*; import java.util.*;
public class Bot extends ServerPlayer implements Terminator { public class Bot extends ServerPlayer implements Terminator {
@@ -326,7 +330,7 @@ public class Bot extends ServerPlayer implements Terminator {
} }
private void loadChunks() { private void loadChunks() {
Level world = getLevel(); Level world = level();
for (int i = chunkPosition().x - 1; i <= chunkPosition().x + 1; i++) { for (int i = chunkPosition().x - 1; i <= chunkPosition().x + 1; i++) {
for (int j = chunkPosition().z - 1; j <= chunkPosition().z + 1; j++) { for (int j = chunkPosition().z - 1; j <= chunkPosition().z + 1; j++) {
@@ -361,7 +365,7 @@ public class Bot extends ServerPlayer implements Terminator {
plugin.getManager().getAgent().onFallDamage(event); plugin.getManager().getAgent().onFallDamage(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
hurt(DamageSource.FALL, (float) Math.pow(3.6, -oldVelocity.getY())); hurt(damageSources().fall(), (float) Math.pow(3.6, -oldVelocity.getY()));
} }
} }
} }

2
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/BotManagerImpl.java
View File

@@ -11,7 +11,7 @@ import net.nuggetmc.tplus.api.event.BotDeathEvent;
import net.nuggetmc.tplus.api.utils.MojangAPI; import net.nuggetmc.tplus.api.utils.MojangAPI;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

4
TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java
View File

@@ -9,8 +9,8 @@ import net.nuggetmc.tplus.api.InternalBridge;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class InternalBridgeImpl implements InternalBridge { public class InternalBridgeImpl implements InternalBridge {

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

@@ -12,7 +12,7 @@ import net.nuggetmc.tplus.command.commands.MainCommand;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.SimpleCommandMap; import org.bukkit.command.SimpleCommandMap;
import org.bukkit.craftbukkit.v1_19_R2.CraftServer; import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;

2
buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts
View File

@@ -3,4 +3,4 @@ plugins {
} }
group = "net.nuggetmc" group = "net.nuggetmc"
version = "4.2.0-BETA" version = "4.3.0-BETA"

BIN
run/plugins/TerminatorPlus-4.3.0-BETA.jar Normal file
View File

Binary file not shown.