Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-03 06:57:41 +01:00
Code Issues Projects Releases Wiki Activity

Update to 1.21.4

Browse Source
This commit is contained in:
fullwall 2024-12-04 21:41:23 +08:00
parent 3f80ad1cd9
commit baa629a1e0
171 changed files with 1451 additions and 1702 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/pom.xml vendored
View File

@ -5,7 +5,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens</artifactId>
<packaging>pom</packaging>
@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>citizens-v1_21_R2</artifactId>
<artifactId>citizens-v1_21_R3</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@ -187,7 +187,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>citizens-v1_21_R2</artifactId>
<artifactId>citizens-v1_21_R3</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@ -206,7 +206,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>citizens-v1_21_R2</artifactId>
<artifactId>citizens-v1_21_R3</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>

4
main/pom.xml
View File

@ -6,12 +6,12 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-main</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.21.3-R0.1-SNAPSHOT</craftbukkit.version>
<craftbukkit.version>1.21.4-R0.1-SNAPSHOT</craftbukkit.version>
<placeholderapi.version>2.11.5</placeholderapi.version>
<citizensapi.version>${project.version}</citizensapi.version>
<worldguard.version>7.1.0-SNAPSHOT</worldguard.version>

8
pom.xml
View File

@ -6,7 +6,7 @@
<packaging>pom</packaging>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
<properties>
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
<CITIZENS_VERSION>2.0.36</CITIZENS_VERSION>
@ -43,7 +43,7 @@
<module>main</module>
<module>v1_19_R3</module>
<module>v1_20_R4</module>
<module>v1_21_R2</module>
<module>v1_21_R3</module>
<module>dist</module>
</modules>
</profile>
@ -63,7 +63,7 @@
<module>v1_18_R2</module>
<module>v1_19_R3</module>
<module>v1_20_R4</module>
<module>v1_21_R2</module>
<module>v1_21_R3</module>
<module>dist</module>
</modules>
</profile>
@ -71,7 +71,7 @@
<id>dev</id>
<modules>
<module>main</module>
<module>v1_21_R2</module>
<module>v1_21_R3</module>
<module>dist</module>
</modules>
</profile>

2
v1_10_R1/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_10_R1</artifactId>
<properties>

2
v1_11_R1/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_11_R1</artifactId>
<properties>

2
v1_12_R1/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_12_R1</artifactId>
<properties>

2
v1_13_R2/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_13_R2</artifactId>
<properties>

2
v1_14_R1/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_14_R1</artifactId>
<properties>

2
v1_15_R1/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_15_R1</artifactId>
<properties>

2
v1_16_R3/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_16_R3</artifactId>
<properties>

2
v1_17_R1/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_17_R1</artifactId>
<properties>

2
v1_18_R2/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_18_R2</artifactId>
<properties>

2
v1_19_R3/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_19_R3</artifactId>
<properties>

2
v1_20_R4/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_20_R4</artifactId>
<properties>

250
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingTransientController.java
View File

@ -1,250 +0,0 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCreakingTransient;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.tags.TagKey;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.monster.creaking.CreakingTransient;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.vehicle.AbstractMinecart;
import net.minecraft.world.entity.vehicle.Boat;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.level.portal.TeleportTransition;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
public class CreakingTransientController extends MobEntityController {
public CreakingTransientController() {
super(EntityCreakingTransientNPC.class, EntityType.CREAKING_TRANSIENT);
}
@Override
public org.bukkit.entity.CreakingTransient getBukkitEntity() {
return (org.bukkit.entity.CreakingTransient) super.getBukkitEntity();
}
public static class CreakingTransientNPC extends CraftCreakingTransient implements ForwardingNPCHolder {
public CreakingTransientNPC(EntityCreakingTransientNPC entity) {
super((CraftServer) Bukkit.getServer(), entity);
}
}
public static class EntityCreakingTransientNPC extends CreakingTransient implements NPCHolder {
private final CitizensNPC npc;
public EntityCreakingTransientNPC(EntityType<? extends CreakingTransient> types, Level level) {
this(types, level, null);
}
public EntityCreakingTransientNPC(EntityType<? extends CreakingTransient> types, Level level, NPC npc) {
super(types, level);
this.npc = (CitizensNPC) npc;
}
@Override
public boolean broadcastToPlayer(ServerPlayer player) {
return NMS.shouldBroadcastToPlayer(npc, () -> super.broadcastToPlayer(player));
}
@Override
protected boolean canRide(Entity entity) {
if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
return !npc.isProtected();
return super.canRide(entity);
}
@Override
public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
if (npc == null || !npc.isFlyable())
return super.causeFallDamage(f, f1, damagesource);
return false;
}
@Override
public void checkDespawn() {
if (npc == null) {
super.checkDespawn();
}
}
@Override
protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, BlockPos blockposition) {
if (npc == null || !npc.isFlyable()) {
super.checkFallDamage(d0, flag, iblockdata, blockposition);
}
}
@Override
public void customServerAiStep(ServerLevel level) {
super.customServerAiStep(level);
if (npc != null) {
NMSImpl.updateMinecraftAIState(npc, this);
npc.update();
if (npc.isProtected()) {
NMSImpl.setScuteTime(this, 2);
}
}
}
@Override
protected SoundEvent getAmbientSound() {
return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND);
}
@Override
public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
NMSImpl.setBukkitEntity(this, new CreakingTransientNPC(this));
}
return super.getBukkitEntity();
}
@Override
protected SoundEvent getDeathSound() {
return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.Metadata.DEATH_SOUND);
}
@Override
protected SoundEvent getHurtSound(DamageSource damagesource) {
return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND);
}
@Override
public float getJumpPower() {
return NMS.getJumpPower(npc, super.getJumpPower());
}
@Override
public int getMaxFallDistance() {
return NMS.getFallDistance(npc, super.getMaxFallDistance());
}
@Override
public NPC getNPC() {
return npc;
}
@Override
public PushReaction getPistonPushReaction() {
return Util.callPistonPushEvent(npc) ? PushReaction.IGNORE : super.getPistonPushReaction();
}
@Override
public boolean isLeashed() {
return NMSImpl.isLeashed(npc, super::isLeashed, this);
}
@Override
public boolean isPushable() {
return npc == null ? super.isPushable()
: npc.data().<Boolean> get(NPC.Metadata.COLLIDABLE, !npc.isProtected());
}
@Override
public void knockback(double strength, double dx, double dz) {
NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
}
@Override
public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) {
if (npc == null || !npc.isProtected())
return super.mobInteract(entityhuman, enumhand);
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
if (itemstack.getItem() == Items.BRUSH)
return InteractionResult.FAIL;
return super.mobInteract(entityhuman, enumhand);
}
@Override
public boolean onClimbable() {
if (npc == null || !npc.isFlyable())
return super.onClimbable();
else
return false;
}
@Override
public void onSyncedDataUpdated(EntityDataAccessor<?> datawatcherobject) {
if (npc == null) {
super.onSyncedDataUpdated(datawatcherobject);
return;
}
NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
}
@Override
public void push(Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.push(entity);
if (npc != null) {
Util.callCollisionEvent(npc, entity.getBukkitEntity());
}
}
@Override
public boolean save(CompoundTag save) {
return npc == null ? super.save(save) : false;
}
@Override
public Entity teleport(TeleportTransition transition) {
if (npc == null)
return super.teleport(transition);
return NMSImpl.teleportAcrossWorld(this, transition);
}
@Override
public void travel(Vec3 vec3d) {
if (npc == null || !npc.isFlyable()) {
super.travel(vec3d);
} else {
NMSImpl.moveLogic(this, vec3d);
}
}
@Override
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
if (npc == null)
return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
Vec3 old = getDeltaMovement().add(0, 0, 0);
boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
if (!npc.isPushableByFluids()) {
setDeltaMovement(old);
}
return res;
}
}
}

6
v1_21_R2/pom.xml → v1_21_R3/pom.xml
View File

@ -4,12 +4,12 @@
<parent>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens-parent</artifactId>
<version>2.0.36-SNAPSHOT</version>
<version>2.0.37-SNAPSHOT</version>
</parent>
<artifactId>citizens-v1_21_R2</artifactId>
<artifactId>citizens-v1_21_R3</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.21.3-R0.1-SNAPSHOT</craftbukkit.version>
<craftbukkit.version>1.21.4-R0.1-SNAPSHOT</craftbukkit.version>
</properties>
<dependencies>

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AllayController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AllayController.java
View File

@ -1,18 +1,18 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftAllay;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftAllay;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import com.google.common.collect.Lists;
import com.mojang.datafixers.util.Pair;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -174,8 +174,8 @@ public class AllayController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmadilloController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmadilloController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftArmadillo;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftArmadillo;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -173,8 +173,8 @@ public class ArmadilloController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

22
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ArmorStandController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ArmorStandController.java
View File

@ -1,17 +1,17 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftArmorStand;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftArmorStand;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.MobAI;
import net.citizensnpcs.nms.v1_21_R2.util.MobAI.ForwardingMobAI;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.MobAI;
import net.citizensnpcs.nms.v1_21_R3.util.MobAI.ForwardingMobAI;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -104,8 +104,8 @@ public class ArmorStandController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/AxolotlController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/AxolotlController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftAxolotl;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftAxolotl;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -169,8 +169,8 @@ public class AxolotlController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BatController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BatController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBat;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBat;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -155,8 +155,8 @@ public class BatController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BeeController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BeeController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBee;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBee;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -152,8 +152,8 @@ public class BeeController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BlazeController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BlazeController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBlaze;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBlaze;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -147,8 +147,8 @@ public class BlazeController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BoggedController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BoggedController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBogged;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBogged;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -165,8 +165,8 @@ public class BoggedController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/BreezeController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/BreezeController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftBreeze;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftBreeze;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -165,8 +165,8 @@ public class BreezeController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CamelController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CamelController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCamel;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCamel;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable;
@ -210,8 +210,8 @@ public class CamelController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CatController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CatController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCat;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCat;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -165,8 +165,8 @@ public class CatController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CaveSpiderController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CaveSpiderController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCaveSpider;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCaveSpider;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -164,8 +164,8 @@ public class CaveSpiderController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ChickenController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ChickenController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftChicken;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftChicken;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -173,8 +173,8 @@ public class ChickenController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CodController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CodController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCod;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCod;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -199,8 +199,8 @@ public class CodController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CowController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CowController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCow;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCow;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -170,8 +170,8 @@ public class CowController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreakingController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreakingController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCreaking;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCreaking;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -173,8 +173,8 @@ public class CreakingController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/CreeperController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/CreeperController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftCreeper;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftCreeper;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -174,8 +174,8 @@ public class CreeperController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DolphinController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DolphinController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftDolphin;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftDolphin;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -170,8 +170,8 @@ public class DolphinController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/DrownedController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/DrownedController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftDrowned;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftDrowned;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -164,8 +164,8 @@ public class DrownedController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EnderDragonController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EnderDragonController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEnderDragon;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEnderDragon;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.versioned.EnderDragonTrait;
@ -215,8 +215,8 @@ public class EnderDragonController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermanController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermanController.java
View File

@ -1,17 +1,17 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import java.util.Optional;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEnderman;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEnderman;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.event.player.PlayerTeleportEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -167,8 +167,8 @@ public class EndermanController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EndermiteController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EndermiteController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEndermite;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEndermite;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -164,8 +164,8 @@ public class EndermiteController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EntityHumanNPC.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EntityHumanNPC.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import java.io.IOException;
import java.lang.invoke.MethodHandle;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin;
@ -19,13 +19,13 @@ import net.citizensnpcs.api.npc.NPC.NPCUpdate;
import net.citizensnpcs.api.trait.trait.Inventory;
import net.citizensnpcs.api.util.Messaging;
import net.citizensnpcs.api.util.SpigotUtil;
import net.citizensnpcs.nms.v1_21_R2.network.EmptyConnection;
import net.citizensnpcs.nms.v1_21_R2.network.EmptyPacketListener;
import net.citizensnpcs.nms.v1_21_R2.util.EmptyAdvancementDataPlayer;
import net.citizensnpcs.nms.v1_21_R2.util.EmptyServerStatsCounter;
import net.citizensnpcs.nms.v1_21_R2.util.MobAI;
import net.citizensnpcs.nms.v1_21_R2.util.MobAI.ForwardingMobAI;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.network.EmptyConnection;
import net.citizensnpcs.nms.v1_21_R3.network.EmptyPacketListener;
import net.citizensnpcs.nms.v1_21_R3.util.EmptyAdvancementDataPlayer;
import net.citizensnpcs.nms.v1_21_R3.util.EmptyServerStatsCounter;
import net.citizensnpcs.nms.v1_21_R3.util.MobAI;
import net.citizensnpcs.nms.v1_21_R3.util.MobAI.ForwardingMobAI;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.npc.skin.SkinPacketTracker;

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/EvokerController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EvokerController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEvoker;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEvoker;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class EvokerController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FoxController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FoxController.java
View File

@ -1,16 +1,16 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import java.lang.invoke.MethodHandle;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftFox;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftFox;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.versioned.FoxTrait;
@ -172,8 +172,8 @@ public class FoxController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/FrogController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/FrogController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftFrog;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftFrog;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -162,8 +162,8 @@ public class FrogController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GhastController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GhastController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGhast;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGhast;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -147,8 +147,8 @@ public class GhastController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GiantController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GiantController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGiant;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGiant;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class GiantController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GlowSquidController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GlowSquidController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGlowSquid;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGlowSquid;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class GlowSquidController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GoatController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GoatController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGoat;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGoat;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -159,8 +159,8 @@ public class GoatController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftGuardian;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftGuardian;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -163,8 +163,8 @@ public class GuardianController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/GuardianElderController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/GuardianElderController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftElderGuardian;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftElderGuardian;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -163,8 +163,8 @@ public class GuardianElderController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HoglinController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HoglinController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftHoglin;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftHoglin;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -164,8 +164,8 @@ public class HoglinController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftHorse;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftHorse;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable;
@ -203,8 +203,8 @@ public class HorseController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseDonkeyController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseDonkeyController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftDonkey;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftDonkey;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable;
@ -203,8 +203,8 @@ public class HorseDonkeyController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseMuleController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseMuleController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMule;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMule;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable;
@ -203,8 +203,8 @@ public class HorseMuleController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseSkeletonController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseSkeletonController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSkeletonHorse;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSkeletonHorse;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable;
@ -203,8 +203,8 @@ public class HorseSkeletonController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HorseZombieController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HorseZombieController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftZombieHorse;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftZombieHorse;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable;
@ -203,8 +203,8 @@ public class HorseZombieController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

4
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/HumanController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/HumanController.java
View File

@ -1,8 +1,8 @@
package net.citizensnpcs.nms.v1_21_R2.entity; import java.util.UUID;
package net.citizensnpcs.nms.v1_21_R3.entity; import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IllusionerController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IllusionerController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftIllusioner;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftIllusioner;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class IllusionerController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/IronGolemController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/IronGolemController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftIronGolem;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftIronGolem;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class IronGolemController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/LlamaController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/LlamaController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftLlama;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftLlama;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable;
@ -203,8 +203,8 @@ public class LlamaController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MagmaCubeController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MagmaCubeController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMagmaCube;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMagmaCube;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class MagmaCubeController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

8
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MobEntityController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MobEntityController.java
View File

@ -1,4 +1,4 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import java.lang.reflect.Constructor;
import java.util.Map;
@ -6,13 +6,13 @@ import java.util.WeakHashMap;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_21_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
import org.bukkit.entity.Entity;
import net.citizensnpcs.Settings.Setting;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R2.util.PitchableLookControl;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.PitchableLookControl;
import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.trait.ScoreboardTrait;
import net.citizensnpcs.util.NMS;

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/MushroomCowController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/MushroomCowController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftMushroomCow;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftMushroomCow;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -162,8 +162,8 @@ public class MushroomCowController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/OcelotController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/OcelotController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftOcelot;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftOcelot;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -165,8 +165,8 @@ public class OcelotController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PandaController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PandaController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPanda;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPanda;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -159,8 +159,8 @@ public class PandaController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ParrotController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ParrotController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftParrot;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftParrot;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -153,8 +153,8 @@ public class ParrotController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PhantomController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PhantomController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPhantom;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPhantom;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -188,8 +188,8 @@ public class PhantomController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPig;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPig;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -166,8 +166,8 @@ public class PigController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PigZombieController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PigZombieController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPigZombie;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPigZombie;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class PigZombieController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinBruteController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinBruteController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPiglinBrute;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPiglinBrute;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -161,8 +161,8 @@ public class PiglinBruteController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PiglinController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PiglinController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPiglin;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPiglin;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -166,8 +166,8 @@ public class PiglinController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PillagerController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PillagerController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPillager;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPillager;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -159,8 +159,8 @@ public class PillagerController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PolarBearController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PolarBearController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPolarBear;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPolarBear;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -143,8 +143,8 @@ public class PolarBearController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/PufferFishController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/PufferFishController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPufferFish;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPufferFish;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.versioned.PufferFishTrait;
@ -201,8 +201,8 @@ public class PufferFishController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RabbitController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RabbitController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftRabbit;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftRabbit;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -168,8 +168,8 @@ public class RabbitController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/RavagerController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/RavagerController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftRavager;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftRavager;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -164,8 +164,8 @@ public class RavagerController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SalmonController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SalmonController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSalmon;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSalmon;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -191,8 +191,8 @@ public class SalmonController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SheepController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SheepController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSheep;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSheep;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -159,8 +159,8 @@ public class SheepController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ShulkerController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ShulkerController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftShulker;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftShulker;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -161,8 +161,8 @@ public class ShulkerController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SilverfishController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SilverfishController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSilverfish;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSilverfish;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class SilverfishController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSkeleton;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSkeleton;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class SkeletonController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonStrayController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonStrayController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftStray;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftStray;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class SkeletonStrayController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SkeletonWitherController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SkeletonWitherController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWitherSkeleton;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWitherSkeleton;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class SkeletonWitherController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SlimeController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SlimeController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSlime;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSlime;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -160,8 +160,8 @@ public class SlimeController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnifferController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnifferController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSniffer;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSniffer;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -164,8 +164,8 @@ public class SnifferController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SnowmanController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SnowmanController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSnowman;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSnowman;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class SnowmanController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SpiderController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SpiderController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSpider;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSpider;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class SpiderController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/SquidController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/SquidController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftSquid;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftSquid;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class SquidController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/StriderController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/StriderController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftStrider;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftStrider;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class StriderController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TadpoleController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TadpoleController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTadpole;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTadpole;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -192,8 +192,8 @@ public class TadpoleController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TraderLlamaController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TraderLlamaController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTraderLlama;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTraderLlama;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.HorseModifiers;
@ -177,8 +177,8 @@ public class TraderLlamaController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TropicalFishController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TropicalFishController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTropicalFish;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTropicalFish;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -194,8 +194,8 @@ public class TropicalFishController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

20
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/TurtleController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/TurtleController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftTurtle;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftTurtle;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.EntityMoveControl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -180,8 +180,8 @@ public class TurtleController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VexController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VexController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftVex;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftVex;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -145,8 +145,8 @@ public class VexController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VillagerController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VillagerController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftVillager;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftVillager;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -181,8 +181,8 @@ public class VillagerController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/VindicatorController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/VindicatorController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftVindicator;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftVindicator;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -159,8 +159,8 @@ public class VindicatorController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WanderingTraderController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WanderingTraderController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWanderingTrader;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWanderingTrader;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -182,8 +182,8 @@ public class WanderingTraderController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WardenController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WardenController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWarden;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWarden;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -165,8 +165,8 @@ public class WardenController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitchController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitchController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWitch;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWitch;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -158,8 +158,8 @@ public class WitchController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WitherController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WitherController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWither;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWither;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -157,8 +157,8 @@ public class WitherController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/WolfController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/WolfController.java
View File

@ -1,15 +1,15 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftWolf;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftWolf;
import org.bukkit.event.entity.EntityTargetEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -161,8 +161,8 @@ public class WolfController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

18
v1_21_R2/src/main/java/net/citizensnpcs/nms/v1_21_R2/entity/ZoglinController.java → v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/ZoglinController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_21_R2.entity;
package net.citizensnpcs.nms.v1_21_R3.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftZoglin;
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftZoglin;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_21_R2.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R2.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_21_R3.util.ForwardingNPCHolder;
import net.citizensnpcs.nms.v1_21_R3.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_21_R3.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
@ -160,8 +160,8 @@ public class ZoglinController extends MobEntityController {
}
@Override
protected AABB makeBoundingBox() {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox());
protected AABB makeBoundingBox(Vec3 vec3) {
return NMSBoundingBox.makeBB(npc, super.makeBoundingBox(vec3));
}
@Override

Some files were not shown because too many files have changed in this diff Show More