Skip to content

feature/remove-custom-corpse-display-names #440

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

Merged
rettichlp merged 1 commit into from
May 29, 2026
Merged

feature/remove-custom-corpse-display-names #440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 0 additions & 76 deletions src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,21 @@
package de.rettichlp.ucutils.mixin;

import de.rettichlp.ucutils.common.models.Faction;
import de.rettichlp.ucutils.common.models.WantedEntry;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.ItemEntity;
import net.minecraft.entity.vehicle.MinecartEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.world.entity.UniquelyIdentifiable;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import java.util.Optional;

import static de.rettichlp.ucutils.UCUtils.commandService;
import static de.rettichlp.ucutils.UCUtils.configuration;
import static de.rettichlp.ucutils.UCUtils.nameTagService;
import static de.rettichlp.ucutils.UCUtils.player;
import static de.rettichlp.ucutils.UCUtils.storage;
import static de.rettichlp.ucutils.UCUtils.utilService;
import static de.rettichlp.ucutils.common.models.Color.WHITE;
import static net.minecraft.item.Items.SKELETON_SKULL;
import static net.minecraft.item.Items.WITHER_SKELETON_SKULL;
import static net.minecraft.text.Text.empty;
import static net.minecraft.text.Text.literal;
import static net.minecraft.util.Formatting.GRAY;

@Mixin(Entity.class)
public abstract class EntityMixin {
Expand Down Expand Up @@ -78,63 +61,4 @@ public abstract class EntityMixin {
storage.setMinecartEntityToHighlight(minecartEntity);
}
}

@Inject(method = "getCustomName", at = @At("RETURN"), cancellable = true)
private void ucutils$getDisplayNameReturn(@NotNull CallbackInfoReturnable<Text> cir) {
if (!storage.isUnicaCity()) {
return;
}

Entity self = (Entity) (Object) this;
if (!(self instanceof ItemEntity itemEntity) || !itemEntity.hasCustomName()) {
return;
}

ItemStack itemStack = itemEntity.getStack();
Text returnValue = cir.getReturnValue();
if (returnValue == null || (!itemStack.isOf(SKELETON_SKULL) && !itemStack.isOf(WITHER_SKELETON_SKULL))) {
return;
}

String displayNameString = returnValue.getString();

// extract player name (✟RettichLP -> RettichLP)
String playerName = displayNameString.substring(1);

// enrich player name with faction information (RettichLP -> RettichLP ⌜✚⌟)
MutableText enrichedDisplayName = getEnrichedDisplayName(playerName);

cir.setReturnValue(empty()
.append(literal("✟").copy().formatted(GRAY))
.append(enrichedDisplayName));
}

@Unique
private MutableText getEnrichedDisplayName(String targetName) {
Faction targetFaction = storage.getCachedFaction(targetName);

Text newTargetDisplayNamePrefix = empty();
Text newTargetDisplayName = literal(targetName);
Text newTargetDisplayNameSuffix = targetFaction.getNameTagSuffix();
Formatting newTargetDisplayNameColor;

// highlight factions
newTargetDisplayNameColor = WHITE.getFormatting();

// wanted
Optional<WantedEntry> optionalTargetWantedEntry = storage.getWantedEntries().stream()
.filter(wantedEntry -> wantedEntry.getPlayerName().equals(targetName))
.findAny();

if (optionalTargetWantedEntry.isPresent()) {
newTargetDisplayNameColor = nameTagService.getWantedPointColor(optionalTargetWantedEntry.get().getWantedPointAmount());
}

return empty()
.append(newTargetDisplayNamePrefix)
.append(" ")
.append(newTargetDisplayName.copy().formatted(newTargetDisplayNameColor))
.append(" ")
.append(newTargetDisplayNameSuffix);
}
}