From 4b177e2ed36532a54315fcf2bf51a6d6b08c8b23 Mon Sep 17 00:00:00 2001 From: furplag Date: Mon, 10 Apr 2023 11:53:51 +0900 Subject: [PATCH] Update Spigot-1.19.4. --- build.gradle.kts | 4 ++-- .../theprogrammersworld/herobrine/AI/AICore.java | 2 +- .../theprogrammersworld/herobrine/Herobrine.java | 2 +- .../herobrine/NPC/Entity/HumanEntity.java | 16 ++++++++-------- .../herobrine/NPC/NMS/NMSServer.java | 2 +- .../herobrine/NPC/NMS/NMSWorld.java | 2 +- .../herobrine/NPC/Network/NetworkHandler.java | 7 +------ .../herobrine/NPC/Network/NetworkUtils.java | 2 +- .../herobrine/entity/EntityManager.java | 4 ++-- .../herobrine/listeners/PlayerListener.java | 2 +- src/main/resources/plugin.yml | 2 +- 11 files changed, 20 insertions(+), 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dc4fea1..e9fc537 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ -val mc_version="1.19.3" +val mc_version="1.19.4" plugins { `java-library` @@ -41,4 +41,4 @@ tasks { } } -tasks.named("jar") { finalizedBy("remap") } \ No newline at end of file +tasks.named("jar") { finalizedBy("remap") } \ No newline at end of file diff --git a/src/main/java/net/theprogrammersworld/herobrine/AI/AICore.java b/src/main/java/net/theprogrammersworld/herobrine/AI/AICore.java index 5b00560..2c11b01 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/AI/AICore.java +++ b/src/main/java/net/theprogrammersworld/herobrine/AI/AICore.java @@ -9,7 +9,7 @@ import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/net/theprogrammersworld/herobrine/Herobrine.java b/src/main/java/net/theprogrammersworld/herobrine/Herobrine.java index a62330f..697b0c2 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/Herobrine.java +++ b/src/main/java/net/theprogrammersworld/herobrine/Herobrine.java @@ -83,7 +83,7 @@ public class Herobrine extends JavaPlugin implements Listener { // If it is not, print an error message and disable the plugin. if (continueWithEnable) { try { - Class.forName("org.bukkit.craftbukkit.v1_19_R2.CraftArt"); + Class.forName("org.bukkit.craftbukkit.v1_19_R3.CraftArt"); } catch (ClassNotFoundException e) { Bukkit.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This version of Herobrine is not " + "compatible with this server's Spigot version and will be disabled."); diff --git a/src/main/java/net/theprogrammersworld/herobrine/NPC/Entity/HumanEntity.java b/src/main/java/net/theprogrammersworld/herobrine/NPC/Entity/HumanEntity.java index fb9f41e..100902d 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/NPC/Entity/HumanEntity.java +++ b/src/main/java/net/theprogrammersworld/herobrine/NPC/Entity/HumanEntity.java @@ -1,19 +1,19 @@ package net.theprogrammersworld.herobrine.NPC.Entity; -import net.minecraft.world.level.GameType; -import net.minecraft.world.entity.MoverType; +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_19_R3.CraftServer; +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer; + +import com.mojang.authlib.GameProfile; + import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.MoverType; +import net.minecraft.world.level.GameType; import net.minecraft.world.phys.Vec3; import net.theprogrammersworld.herobrine.NPC.NPCCore; import net.theprogrammersworld.herobrine.NPC.NMS.NMSWorld; import net.theprogrammersworld.herobrine.NPC.Network.NetworkHandler; -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_19_R2.CraftServer; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; - -import com.mojang.authlib.GameProfile; - public class HumanEntity extends ServerPlayer { private CraftPlayer cplayer = null; diff --git a/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSServer.java b/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSServer.java index f672c32..91b750e 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSServer.java +++ b/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSServer.java @@ -12,7 +12,7 @@ import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; import org.bukkit.Server; -import org.bukkit.craftbukkit.v1_19_R2.CraftServer; +import org.bukkit.craftbukkit.v1_19_R3.CraftServer; public class NMSServer { diff --git a/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSWorld.java b/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSWorld.java index 21a2755..f70cc87 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSWorld.java +++ b/src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSWorld.java @@ -8,7 +8,7 @@ import net.minecraft.server.level.ChunkMap; import net.minecraft.server.level.ServerLevel; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; public class NMSWorld { diff --git a/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkHandler.java b/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkHandler.java index b0decf2..a40357f 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkHandler.java +++ b/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkHandler.java @@ -11,14 +11,9 @@ public class NetworkHandler extends ServerGamePacketListenerImpl { super(npcCore.getServer().getMCServer(), npcCore.getNetworkCore(), entityPlayer); } - @Override - public void dismount(final double d0, final double d1, final double d2, final float f, final float f1) { - - } - @Override public void send(final Packet packet) { - + } } \ No newline at end of file diff --git a/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkUtils.java b/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkUtils.java index bad54a4..55e61dd 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkUtils.java +++ b/src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkUtils.java @@ -5,7 +5,7 @@ import net.minecraft.network.protocol.Packet; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/net/theprogrammersworld/herobrine/entity/EntityManager.java b/src/main/java/net/theprogrammersworld/herobrine/entity/EntityManager.java index 616a852..3cbb742 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/entity/EntityManager.java +++ b/src/main/java/net/theprogrammersworld/herobrine/entity/EntityManager.java @@ -14,7 +14,7 @@ public class EntityManager { public void spawnCustomZombie(Location loc,MobType mbt){ World world = loc.getWorld(); - net.minecraft.world.level.Level mcWorld = ((org.bukkit.craftbukkit.v1_19_R2.CraftWorld) world).getHandle(); + net.minecraft.world.level.Level mcWorld = ((org.bukkit.craftbukkit.v1_19_R3.CraftWorld) world).getHandle(); CustomZombie zmb = new CustomZombie(mcWorld,loc,mbt); mcWorld.addFreshEntity(zmb, SpawnReason.CUSTOM); mobList.put(Integer.valueOf(zmb.getBukkitEntity().getEntityId()),zmb); @@ -24,7 +24,7 @@ public class EntityManager { public void spawnCustomSkeleton(Location loc,MobType mbt){ World world = loc.getWorld(); - net.minecraft.world.level.Level mcWorld = ((org.bukkit.craftbukkit.v1_19_R2.CraftWorld) world).getHandle(); + net.minecraft.world.level.Level mcWorld = ((org.bukkit.craftbukkit.v1_19_R3.CraftWorld) world).getHandle(); CustomSkeleton zmb = new CustomSkeleton(mcWorld,loc,mbt); mcWorld.addFreshEntity(zmb, SpawnReason.CUSTOM); mobList.put(Integer.valueOf(zmb.getBukkitEntity().getEntityId()), zmb); diff --git a/src/main/java/net/theprogrammersworld/herobrine/listeners/PlayerListener.java b/src/main/java/net/theprogrammersworld/herobrine/listeners/PlayerListener.java index 12e7dfc..293ae85 100644 --- a/src/main/java/net/theprogrammersworld/herobrine/listeners/PlayerListener.java +++ b/src/main/java/net/theprogrammersworld/herobrine/listeners/PlayerListener.java @@ -12,7 +12,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Jukebox; -import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 16a3533..38c967e 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Herobrine main: net.theprogrammersworld.herobrine.Herobrine -version: 2.5.0-SNAPSHOT +version: 2.6.0-SNAPSHOT description: "Bring Herobrine to your Spigot-based Minecraft server!" website: https://www.theprogrammersworld.net api-version: 1.19