Fork/herobrine-2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in spigot-1.19.4 (pull request #2)

Browse Source 
Update Spigot-1.19.4.
This commit is contained in:
furplag 2023-04-10 03:07:30 +00:00
commit 7291c19e32
11 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -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") }
tasks.named("jar") { finalizedBy("remap") }

2
src/main/java/net/theprogrammersworld/herobrine/AI/AICore.java
View File

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

2
src/main/java/net/theprogrammersworld/herobrine/Herobrine.java
View File

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

16
src/main/java/net/theprogrammersworld/herobrine/NPC/Entity/HumanEntity.java
View File

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

2
src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSServer.java
View File

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

2
src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/NMSWorld.java
View File

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

7
src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkHandler.java
View File

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

2
src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkUtils.java
View File

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

4
src/main/java/net/theprogrammersworld/herobrine/entity/EntityManager.java
View File

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

2
src/main/java/net/theprogrammersworld/herobrine/listeners/PlayerListener.java
View File

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

2
src/main/resources/plugin.yml
View File

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