Skip to content

Bridge Paper-specific trait methods through NMS #3320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
airgalaxie wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bridge Paper-specific trait methods through NMS #3320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91e4bc5
Fix EnderDragon NPC ticking on Paper 26.2
airgalaxie Jul 4, 2026
c36f1a9
Merge branch 'CitizensDev:master' into master
airgalaxie Jul 7, 2026
67dfe08
Move Paper-specific entity trait calls behind NMS bridge
airgalaxie Jul 7, 2026
e824aa6
Merge branch 'CitizensDev:master' into master
airgalaxie Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main/src/main/java/net/citizensnpcs/trait/versioned/CopperGolemTrait.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static void copperGolem(CommandContext args, CommandSender sender, NPC np
output += Messaging.tr(Messages.COPPER_WEATHER_STATE_SET, state);
}
if (tick != null) {
((CopperGolem) npc.getEntity()).setNextWeatheringTick(tick);
NMS.setCopperGolemWeatheringTick(npc.getEntity(), tick);
output += Messaging.tr(Messages.COPPER_WEATHER_TICK_SET, tick);
}
if (!output.isEmpty()) {
Expand All @@ -112,4 +112,4 @@ public static void copperGolem(CommandContext args, CommandSender sender, NPC np
}
}
}
}
}
4 changes: 2 additions & 2 deletions main/src/main/java/net/citizensnpcs/trait/versioned/MannequinTrait.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void run() {
description == null ? null : Messaging.minecraftComponentFromRawMessage(description));
}
mannequin.setImmovable(immovable);
mannequin.setHideDescription(hideDescription);
NMS.setMannequinHideDescription(mannequin, hideDescription);
}
}

Expand Down Expand Up @@ -105,4 +105,4 @@ public static void mannequin(CommandContext args, CommandSender sender, NPC npc,
Messaging.send(sender, output);
}
}
}
}
8 changes: 8 additions & 0 deletions main/src/main/java/net/citizensnpcs/util/NMS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,10 @@ public static void setHeadYaw(Entity entity, float yaw) {
BRIDGE.setHeadYaw(entity, yaw);
}

public static void setCopperGolemWeatheringTick(Entity copperGolem, long tick) {
BRIDGE.setCopperGolemWeatheringTick(copperGolem, tick);
}

public static void setKnockbackResistance(org.bukkit.entity.LivingEntity entity, double d) {
BRIDGE.setKnockbackResistance(entity, d);
}
Expand All @@ -967,6 +971,10 @@ public static void setMannequinDescription(Entity mannequin, Object component) {
BRIDGE.setMannequinDescription(mannequin, component);
}

public static void setMannequinHideDescription(Entity mannequin, boolean hide) {
BRIDGE.setMannequinHideDescription(mannequin, hide);
}

public static void setNavigationTarget(Entity handle, Entity target, float speed) {
BRIDGE.setNavigationTarget(handle, target, speed);
}
Expand Down
6 changes: 6 additions & 0 deletions main/src/main/java/net/citizensnpcs/util/NMSBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ public default void setCamelPose(Entity entity, CamelPose pose) {

public void setHeadYaw(Entity entity, float yaw);

public default void setCopperGolemWeatheringTick(Entity copperGolem, long tick) {
}

public default void setKnockbackResistance(LivingEntity entity, double d) {
AttributeInstance ai = entity.getAttribute(Attribute.KNOCKBACK_RESISTANCE);
if (ai != null) {
Expand All @@ -253,6 +256,9 @@ public default void setLyingDown(Entity cat, boolean lying) {
public default void setMannequinDescription(Entity mannequin, Object component) {
}

public default void setMannequinHideDescription(Entity mannequin, boolean hide) {
}

public void setNavigationTarget(Entity handle, Entity target, float speed);

public void setNavigationType(Entity entity, MinecraftNavigationType type);
Expand Down
12 changes: 11 additions & 1 deletion v1_21_R7/src/main/java/net/citizensnpcs/nms/v1_21_R7/util/NMSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,6 +1678,16 @@ public void setMannequinDescription(org.bukkit.entity.Entity mannequin, Object c
((Mannequin) getHandle(mannequin)).setDescription((Component) component);
}

@Override
public void setMannequinHideDescription(org.bukkit.entity.Entity mannequin, boolean hide) {
((Mannequin) getHandle(mannequin)).setHideDescription(hide);
}

@Override
public void setCopperGolemWeatheringTick(org.bukkit.entity.Entity copperGolem, long tick) {
((net.minecraft.world.entity.animal.golem.CopperGolem) getHandle(copperGolem)).nextWeatheringTick = tick;
}

@Override
public void setNavigationTarget(org.bukkit.entity.Entity handle, org.bukkit.entity.Entity target, float speed) {
getNavigation(handle).moveTo(getHandle(target), speed);
Expand Down Expand Up @@ -2912,4 +2922,4 @@ public static void updateMinecraftAIState(NPC npc, Mob entity) {
Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
}
}
}
}
12 changes: 11 additions & 1 deletion v26_1_R1/src/main/java/net/citizensnpcs/nms/v26_1_R1/util/NMSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,6 +1681,16 @@ public void setMannequinDescription(org.bukkit.entity.Entity mannequin, Object c
((Mannequin) getHandle(mannequin)).setDescription((Component) component);
}

@Override
public void setMannequinHideDescription(org.bukkit.entity.Entity mannequin, boolean hide) {
((Mannequin) getHandle(mannequin)).setHideDescription(hide);
}

@Override
public void setCopperGolemWeatheringTick(org.bukkit.entity.Entity copperGolem, long tick) {
((net.minecraft.world.entity.animal.golem.CopperGolem) getHandle(copperGolem)).nextWeatheringTick = tick;
}

@Override
public void setNavigationTarget(org.bukkit.entity.Entity handle, org.bukkit.entity.Entity target, float speed) {
getNavigation(handle).moveTo(getHandle(target), speed);
Expand Down Expand Up @@ -3059,4 +3069,4 @@ public <U> void acceptEmpty(MemoryModuleType<U> type) {
Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
}
}
}
}
12 changes: 11 additions & 1 deletion v26_2_R1/src/main/java/net/citizensnpcs/nms/v26_2_R1/util/NMSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,6 +1684,16 @@ public void setMannequinDescription(org.bukkit.entity.Entity mannequin, Object c
((Mannequin) getHandle(mannequin)).setDescription((Component) component);
}

@Override
public void setMannequinHideDescription(org.bukkit.entity.Entity mannequin, boolean hide) {
((Mannequin) getHandle(mannequin)).setHideDescription(hide);
}

@Override
public void setCopperGolemWeatheringTick(org.bukkit.entity.Entity copperGolem, long tick) {
((net.minecraft.world.entity.animal.golem.CopperGolem) getHandle(copperGolem)).nextWeatheringTick = tick;
}

@Override
public void setNavigationTarget(org.bukkit.entity.Entity handle, org.bukkit.entity.Entity target, float speed) {
getNavigation(handle).moveTo(getHandle(target), speed);
Expand Down Expand Up @@ -3091,4 +3101,4 @@ public <U> void acceptEmpty(MemoryModuleType<U> type) {
Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
}
}
}
}