-
-
Notifications
You must be signed in to change notification settings - Fork 313
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix no such method error on severely outdated minecraft versions, add…
… InteractionController
- Loading branch information
Showing
4 changed files
with
136 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
...3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| package net.citizensnpcs.nms.v1_19_R3.entity.nonliving; | ||
|
|
||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.craftbukkit.v1_19_R3.CraftServer; | ||
| import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity; | ||
| import org.bukkit.craftbukkit.v1_19_R3.entity.CraftInteraction; | ||
| import org.bukkit.util.Vector; | ||
|
|
||
| import net.citizensnpcs.api.npc.NPC; | ||
| import net.citizensnpcs.nms.v1_19_R3.entity.MobEntityController; | ||
| import net.citizensnpcs.nms.v1_19_R3.util.ForwardingNPCHolder; | ||
| import net.citizensnpcs.nms.v1_19_R3.util.NMSBoundingBox; | ||
| import net.citizensnpcs.nms.v1_19_R3.util.NMSImpl; | ||
| import net.citizensnpcs.npc.CitizensNPC; | ||
| import net.citizensnpcs.npc.ai.NPCHolder; | ||
| import net.citizensnpcs.util.Util; | ||
| import net.minecraft.core.PositionImpl; | ||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.server.level.ServerLevel; | ||
| import net.minecraft.tags.TagKey; | ||
| import net.minecraft.world.entity.Entity; | ||
| import net.minecraft.world.entity.EntityType; | ||
| import net.minecraft.world.entity.Interaction; | ||
| import net.minecraft.world.level.Level; | ||
| import net.minecraft.world.level.material.Fluid; | ||
| import net.minecraft.world.phys.AABB; | ||
|
|
||
| public class InteractionController extends MobEntityController { | ||
| public InteractionController() { | ||
| super(EntityInteractionNPC.class); | ||
| } | ||
|
|
||
| @Override | ||
| public org.bukkit.entity.Interaction getBukkitEntity() { | ||
| return (org.bukkit.entity.Interaction) super.getBukkitEntity(); | ||
| } | ||
|
|
||
| public static class EntityInteractionNPC extends Interaction implements NPCHolder { | ||
| private final CitizensNPC npc; | ||
|
|
||
| public EntityInteractionNPC(EntityType<? extends Interaction> types, Level level) { | ||
| this(types, level, null); | ||
| } | ||
|
|
||
| public EntityInteractionNPC(EntityType<? extends Interaction> types, Level level, NPC npc) { | ||
| super(types, level); | ||
| this.npc = (CitizensNPC) npc; | ||
| } | ||
|
|
||
| @Override | ||
| public CraftEntity getBukkitEntity() { | ||
| if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { | ||
| NMSImpl.setBukkitEntity(this, new InteractionNPC(this)); | ||
| } | ||
| return super.getBukkitEntity(); | ||
| } | ||
|
|
||
| @Override | ||
| public NPC getNPC() { | ||
| return npc; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isPushable() { | ||
| return npc == null ? super.isPushable() | ||
| : npc.data().<Boolean> get(NPC.Metadata.COLLIDABLE, !npc.isProtected()); | ||
| } | ||
|
|
||
| @Override | ||
| protected AABB makeBoundingBox() { | ||
| return NMSBoundingBox.makeBB(npc, super.makeBoundingBox()); | ||
| } | ||
|
|
||
| @Override | ||
| public void push(double x, double y, double z) { | ||
| Vector vector = Util.callPushEvent(npc, x, y, z); | ||
| if (vector != null) { | ||
| super.push(vector.getX(), vector.getY(), vector.getZ()); | ||
| } | ||
| } | ||
|
|
||
| @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 teleportTo(ServerLevel worldserver, PositionImpl location) { | ||
| if (npc == null) | ||
| return super.teleportTo(worldserver, location); | ||
| return NMSImpl.teleportAcrossWorld(this, worldserver, location); | ||
| } | ||
|
|
||
| @Override | ||
| public void tick() { | ||
| if (npc != null) { | ||
| npc.update(); | ||
| } else { | ||
| super.tick(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) { | ||
| return NMSImpl.fluidPush(npc, this, () -> super.updateFluidHeightAndDoFluidPushing(tagkey, d0)); | ||
| } | ||
| } | ||
|
|
||
| public static class InteractionNPC extends CraftInteraction implements ForwardingNPCHolder { | ||
| public InteractionNPC(EntityInteractionNPC entity) { | ||
| super((CraftServer) Bukkit.getServer(), entity); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters