diff --git a/TerminatorPlus-Plugin/build.gradle.kts b/TerminatorPlus-Plugin/build.gradle.kts index ff7b86f..d800704 100644 --- a/TerminatorPlus-Plugin/build.gradle.kts +++ b/TerminatorPlus-Plugin/build.gradle.kts @@ -13,7 +13,7 @@ java { } dependencies { - paperDevBundle("1.19.3-R0.1-SNAPSHOT") + paperDevBundle("1.20.1-R0.1-SNAPSHOT") //add the TerminatorPlus-API module implementation(project(":TerminatorPlus-API")) 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 b5ff3ec..5463bfd 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/TerminatorPlus.java @@ -12,7 +12,7 @@ import java.util.Arrays; 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 String version; 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 098f68b..505a72f 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 @@ -2,11 +2,13 @@ package net.nuggetmc.tplus.bot; import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Pair; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.network.Connection; import net.minecraft.network.PacketSendListener; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; import net.minecraft.network.protocol.game.*; +import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -24,6 +26,7 @@ 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.TerminatorPlusAPI; import net.nuggetmc.tplus.api.agent.Agent; import net.nuggetmc.tplus.api.agent.legacyagent.LegacyMats; 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.BlockFace; import org.bukkit.block.data.Waterlogged; -import org.bukkit.craftbukkit.v1_19_R2.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_19_R2.CraftServer; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R1.CraftEquipmentSlot; +import org.bukkit.craftbukkit.v1_20_R1.CraftServer; +import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Damageable; import org.bukkit.entity.Player; @@ -49,6 +52,7 @@ import org.bukkit.util.BoundingBox; import org.bukkit.util.Vector; import org.jetbrains.annotations.Nullable; +import java.lang.reflect.Field; import java.util.*; public class Bot extends ServerPlayer implements Terminator { @@ -326,7 +330,7 @@ public class Bot extends ServerPlayer implements Terminator { } private void loadChunks() { - Level world = getLevel(); + Level world = level(); for (int i = chunkPosition().x - 1; i <= chunkPosition().x + 1; i++) { 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); if (!event.isCancelled()) { - hurt(DamageSource.FALL, (float) Math.pow(3.6, -oldVelocity.getY())); + hurt(damageSources().fall(), (float) Math.pow(3.6, -oldVelocity.getY())); } } } 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 999be60..d7e6f0d 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 @@ -11,7 +11,7 @@ import net.nuggetmc.tplus.api.event.BotDeathEvent; import net.nuggetmc.tplus.api.utils.MojangAPI; import org.bukkit.*; 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.LivingEntity; import org.bukkit.entity.Player; 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 index f23661c..0ce0695 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bridge/InternalBridgeImpl.java @@ -9,8 +9,8 @@ import net.nuggetmc.tplus.api.InternalBridge; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer; import org.bukkit.entity.Player; public class InternalBridgeImpl implements InternalBridge { 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 e77b562..fb3cff3 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 @@ -12,7 +12,7 @@ import net.nuggetmc.tplus.command.commands.MainCommand; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; 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.util.ArrayList; diff --git a/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts index e6bda9f..b1bc445 100644 --- a/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/net.nuggetmc.java-conventions.gradle.kts @@ -3,4 +3,4 @@ plugins { } group = "net.nuggetmc" -version = "4.2.0-BETA" +version = "4.3.0-BETA" diff --git a/run/plugins/TerminatorPlus-4.3.0-BETA.jar b/run/plugins/TerminatorPlus-4.3.0-BETA.jar new file mode 100644 index 0000000..8befaa8 Binary files /dev/null and b/run/plugins/TerminatorPlus-4.3.0-BETA.jar differ