Skip to content

Commit b3da070

Browse files
committed
Add ability to disable glowing
1 parent 6ff55ab commit b3da070

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

common/src/main/java/org/samo_lego/taterzens/mixin/network/ServerGamePacketListenerImplMixin_PacketFaker.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,28 +115,28 @@ private void changeEntityType(Packet<?> packet, PacketSendListener listener, Cal
115115
// the client to fetch skin.
116116
// If player is immediately removed from the tablist,
117117
// client doesn't care about the skin.
118-
if(config.taterzenTablistTimeout != -1) {
118+
if (config.taterzenTablistTimeout != -1) {
119119
var uuid = npc.getGameProfile().getId();
120120
taterzens$tablistQueue.remove(uuid);
121121
taterzens$tablistQueue.put(uuid, new NpcPlayerUpdate(npc.getGameProfile(), npc.getTabListName(), taterzens$queueTick + config.taterzenTablistTimeout));
122122
}
123123

124-
this.connection.send(new ClientboundRotateHeadPacket(entity, (byte)((int)(entity.getYHeadRot() * 256.0F / 360.0F))), listener);
124+
this.connection.send(new ClientboundRotateHeadPacket(entity, (byte) ((int) (entity.getYHeadRot() * 256.0F / 360.0F))), listener);
125125

126126
ci.cancel();
127-
} else if(packet instanceof ClientboundSetEntityDataPacket) {
127+
} else if (packet instanceof ClientboundSetEntityDataPacket) {
128128
Entity entity = world.getEntity(((ClientboundSetEntityDataPacketAccessor) packet).getEntityId());
129129

130-
if(!(entity instanceof TaterzenNPC taterzen))
130+
if (!(entity instanceof TaterzenNPC taterzen))
131131
return;
132132
Player fakePlayer = taterzen.getFakePlayer();
133133
List<SynchedEntityData.DataItem<?>> trackedValues = fakePlayer.getEntityData().getAll();
134134

135-
if(taterzen.equals(((ITaterzenEditor) this.player).getNpc()) && trackedValues != null) {
135+
if (taterzen.equals(((ITaterzenEditor) this.player).getNpc()) && trackedValues != null && config.glowSelectedNpc) {
136136
trackedValues.removeIf(value -> value.getAccessor().getId() == 0);
137137
Byte flags = fakePlayer.getEntityData().get(EntityAccessor.getFLAGS());
138138
// Modify Taterzen to have fake glowing effect for the player
139-
flags = (byte)(flags | 1 << EntityAccessor.getFLAG_GLOWING());
139+
flags = (byte) (flags | 1 << EntityAccessor.getFLAG_GLOWING());
140140

141141
SynchedEntityData.DataItem<Byte> glowingTag = new SynchedEntityData.DataItem<>(EntityAccessor.getFLAGS(), flags);
142142
trackedValues.add(glowingTag);

common/src/main/java/org/samo_lego/taterzens/storage/TaterConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ public class TaterConfig implements IBrigadierConfigurator {
105105
@SerializedName("combat_in_peaceful")
106106
public boolean combatInPeaceful = true;
107107

108+
109+
@SerializedName("// Whether give fake glowing effect to Taterzen when selected.")
110+
public final String _comment_glowSelectedNpc = "";
111+
@BrigadierDescription(defaultOption = "true")
112+
@SerializedName("glow_selected_npc")
113+
public boolean glowSelectedNpc = true;
114+
108115
@Override
109116
public void save() {
110117
this.saveConfigFile(Taterzens.getInstance().getConfigFile());

0 commit comments

Comments
 (0)