sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

remove custom names from non-living

Browse source
This commit is contained in:
Sen 2025-08-02 20:53:00 +02:00
parent f29623eec6
commit 50fec6dd56
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
46 changed files with 290 additions and 511 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/src/main/java/server/Server.java
View file

@ -920,7 +920,7 @@ public final class Server implements IThreadListener, Executor {
Log.NETWORK.info(loginUser + "[" + connection.getCutAddress() + "] hat sich mit Objekt-ID "
+ player.getId() + " auf " + UniverseRegistry.getName(world.dimension) + ": "
+ String.format("%.2f %.2f %.2f", player.posX, player.posY, player.posZ) + " verbunden (" + (tag == null ? "Charakter-Editor" : "'" + player.getCommandName() + "'") + ")");
+ String.format("%.2f %.2f %.2f", player.posX, player.posY, player.posZ) + " verbunden (" + (tag == null ? "Charakter-Editor" : "'" + player.getRawName() + "'") + ")");
List<Pair<String, Object>> vars = Lists.newArrayList();
for(Entry<String, SVar> var : this.variables.entrySet()) {

2
server/src/main/java/server/command/PlayerItemParser.java
View file

@ -12,7 +12,7 @@ public class PlayerItemParser extends PlayerEntityParser {
EntityNPC entity = (EntityNPC)super.parse(env, input);
ItemStack stack = entity.getHeldItem();
if(stack == null)
throw new RunException("%s hält keinen Gegenstand in der Hand", entity.getCommandName());
throw new RunException("%s hält keinen Gegenstand in der Hand", entity.getRawName());
return stack;
}

2
server/src/main/java/server/command/commands/CommandClear.java
View file

@ -25,7 +25,7 @@ public class CommandClear extends Command {
((EntityNPC)entity).setMouseItem(null);
else
((EntityNPC)entity).setHeldItem(null);
exec.log("Inventar von %s gelöscht", entity.getCommandName());
exec.log("Inventar von %s gelöscht", entity.getRawName());
done++;
}
}

4
server/src/main/java/server/command/commands/CommandDeathspot.java
View file

@ -24,10 +24,10 @@ public class CommandDeathspot extends Command {
public Object exec(CommandEnvironment env, Executor exec, EntityNPC player, List<Entity> entities) {
Position pos = ((Player)player.connection).getLastDeath();
if(pos == null)
throw new RunException("%s hat keinen letzten Todespunkt", player.getCommandName());
throw new RunException("%s hat keinen letzten Todespunkt", player.getRawName());
for(Entity entity : entities) {
entity.teleport(pos);
exec.log("%s zum Todespunkt von %s (%d, %d, %d in %s) teleportiert", entity.getCommandName(), player.getCommandName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
exec.log("%s zum Todespunkt von %s (%d, %d, %d in %s) teleportiert", entity.getRawName(), player.getRawName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
}
return entities.size();
}

4
server/src/main/java/server/command/commands/CommandEntity.java
View file

@ -28,13 +28,13 @@ public class CommandEntity extends Command {
entity.writeTags(etag);
if(tag == null) {
exec.log("************************************************************");
exec.log("Daten von %s bei %d, %d, %d in %s:", entity.getCommandName(), pos.getX(), pos.getY(), pos.getZ(), entity.worldObj.dimension.getDisplay());
exec.log("Daten von %s bei %d, %d, %d in %s:", entity.getRawName(), pos.getX(), pos.getY(), pos.getZ(), entity.worldObj.dimension.getDisplay());
exec.log(etag.format(4));
}
else {
etag.merge(tag);
entity.readTags(etag);
exec.log("Daten von %s bei %d, %d, %d in %s geändert", entity.getCommandName(), pos.getX(), pos.getY(), pos.getZ(), entity.worldObj.dimension.getDisplay());
exec.log("Daten von %s bei %d, %d, %d in %s geändert", entity.getRawName(), pos.getX(), pos.getY(), pos.getZ(), entity.worldObj.dimension.getDisplay());
}
done++;
}

6
server/src/main/java/server/command/commands/CommandExp.java
View file

@ -22,16 +22,16 @@ public class CommandExp extends Command {
public void exec(CommandEnvironment env, Executor exec, Integer points, boolean reset, List<EntityNPC> players) {
for(EntityNPC player : players) {
if(points == null && !reset) {
exec.log("Erfahrung von %s: Level %d, %d/%d (%d Punkte)", player.getCommandName(), player.experienceLevel, (int)((float)player.xpBarCap() * player.experience), player.xpBarCap(), player.experienceTotal);
exec.log("Erfahrung von %s: Level %d, %d/%d (%d Punkte)", player.getRawName(), player.experienceLevel, (int)((float)player.xpBarCap() * player.experience), player.xpBarCap(), player.experienceTotal);
}
else if(reset) {
player.setExperience(points == null ? 0 : points);
exec.log("Erfahrung von %s " + (points == null ? "zurückgesetzt" : "auf %d Punkte gesetzt (Level %d)"), player.getCommandName(), player.experienceTotal, player.experienceLevel);
exec.log("Erfahrung von %s " + (points == null ? "zurückgesetzt" : "auf %d Punkte gesetzt (Level %d)"), player.getRawName(), player.experienceTotal, player.experienceLevel);
}
else {
int level = player.experienceLevel;
player.addExperience(points);
exec.log("%d Erfahrungspunkte an %s gegeben" + (player.experienceLevel != level ? ", ist jetzt Level %d" : ""), points, player.getCommandName(), player.experienceLevel);
exec.log("%d Erfahrungspunkte an %s gegeben" + (player.experienceLevel != level ? ", ist jetzt Level %d" : ""), points, player.getRawName(), player.experienceLevel);
}
}
if(players.size() > 1) {

2
server/src/main/java/server/command/commands/CommandFind.java
View file

@ -21,7 +21,7 @@ public class CommandFind extends Command {
for(Entity entity : entities) {
if(entity.isEntityAlive()) {
BlockPos pos = entity.getPosition();
exec.log("%s bei %d, %d, %d in %s gefunden %s", entity.getCommandName(), pos.getX(), pos.getY(), pos.getZ(), entity.worldObj.dimension.getDisplay(),
exec.log("%s bei %d, %d, %d in %s gefunden %s", entity.getRawName(), pos.getX(), pos.getY(), pos.getZ(), entity.worldObj.dimension.getDisplay(),
asCommand(null, "tp #%d", entity.getId()));
done++;
}

2
server/src/main/java/server/command/commands/CommandGod.java
View file

@ -27,7 +27,7 @@ public class CommandGod extends Command {
if(!quiet)
player.connection.addFeed(!remove ? (Color.GREEN + "Statuseffekte wurden hinzugefügt") : (Color.RED + "Statuseffekte wurden entfernt"));
if(quiet || player.connection != exec)
exec.log("Statuseffekte " + (!remove ? "an %s gegeben" : "von %s entfernt"), player.getCommandName());
exec.log("Statuseffekte " + (!remove ? "an %s gegeben" : "von %s entfernt"), player.getRawName());
}
if(players.size() > 1)
exec.log("Statuseffekte " + (!remove ? "an %d Spieler gegeben" : "von %d Spielern entfernt"), players.size());

2
server/src/main/java/server/command/commands/CommandItem.java
View file

@ -54,7 +54,7 @@ public class CommandItem extends Command {
total = amount - total;
if(total <= 0)
continue;
exec.log("%d * %s zum Inventar von %s hinzugefügt", total, stack.getDisplayName(), player.getCommandName());
exec.log("%d * %s zum Inventar von %s hinzugefügt", total, stack.getDisplayName(), player.getRawName());
done++;
given += total;
}

4
server/src/main/java/server/command/commands/CommandMilk.java
View file

@ -32,12 +32,12 @@ public class CommandMilk extends Command {
if(type != null && entity.hasEffect(type)) {
int amplifier = entity.getEffect(type).getAmplifier();
entity.removeEffect(type);
exec.log("%s von %s entfernt", type.getDisplay(amplifier), entity.getCommandName());
exec.log("%s von %s entfernt", type.getDisplay(amplifier), entity.getRawName());
done++;
}
else if(type == null && !entity.getEffects().isEmpty()) {
entity.clearEffects(negative);
exec.log("Alle Effekte von %s entfernt", entity.getCommandName());
exec.log("Alle Effekte von %s entfernt", entity.getRawName());
done++;
}
}

2
server/src/main/java/server/command/commands/CommandMore.java
View file

@ -41,7 +41,7 @@ public class CommandMore extends Command {
add += this.addItems(player.getHeldItem());
}
if(add > 0) {
exec.log("%d " + (add == 1 ? "Gegenstand" : "Gegenstände") + " wurde" + (add == 1 ? "" : "n") + " dem Inventar von %s hinzugefügt", add, player.getCommandName());
exec.log("%d " + (add == 1 ? "Gegenstand" : "Gegenstände") + " wurde" + (add == 1 ? "" : "n") + " dem Inventar von %s hinzugefügt", add, player.getRawName());
done++;
}
added += add;

2
server/src/main/java/server/command/commands/CommandNoclip.java
View file

@ -29,7 +29,7 @@ public class CommandNoclip extends Command {
if(!quiet)
player.connection.addFeed((!remove ? Color.GREEN : Color.RED) + "NoClip wurde " + (!remove ? "eingeschaltet" : "ausgeschaltet"));
if(quiet || player.connection != exec)
exec.log("NoClip für %s " + (!remove ? "eingeschaltet" : "ausgeschaltet"), player.getCommandName());
exec.log("NoClip für %s " + (!remove ? "eingeschaltet" : "ausgeschaltet"), player.getRawName());
done++;
}
if(done > 1)

2
server/src/main/java/server/command/commands/CommandOfflinetp.java
View file

@ -33,7 +33,7 @@ public class CommandOfflinetp extends Command {
throw new RunException("Spieler '%s' konnte nicht gefunden werden", user);
for(Entity entity : entities) {
entity.teleport(pos);
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getCommandName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getRawName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
}
return entities.size();
}

2
server/src/main/java/server/command/commands/CommandPlayers.java
View file

@ -27,7 +27,7 @@ public class CommandPlayers extends Command {
exec.log(Color.GREEN + "Es " + (players.size() == 1 ? "ist" : "sind") + " " + Color.YELLOW + "%d" + Color.GREEN + " Spieler online", players.size());
for(Player player : players) {
EntityNPC entity = player.getPresentEntity();
exec.log("%s%s" + Color.GRAY + ": '%s" + Color.GRAY + "'" + (coords && entity != null ? " [" + Color.ORANGE + "%s @ %d, %d, %d" + Color.GRAY + "]" : ""), player.isAdmin() ? Color.RED : Color.NEON, player.getUser(), entity == null ? Color.DARK_GRAY + "<->" : Color.ACID + entity.getCommandName(), entity == null ? null : entity.worldObj.dimension.getDisplay(), entity == null ? null : ExtMath.floord(entity.posX), entity == null ? null : ExtMath.floord(entity.posY), entity == null ? null : ExtMath.floord(entity.posZ));
exec.log("%s%s" + Color.GRAY + ": '%s" + Color.GRAY + "'" + (coords && entity != null ? " [" + Color.ORANGE + "%s @ %d, %d, %d" + Color.GRAY + "]" : ""), player.isAdmin() ? Color.RED : Color.NEON, player.getUser(), entity == null ? Color.DARK_GRAY + "<->" : Color.ACID + entity.getRawName(), entity == null ? null : entity.worldObj.dimension.getDisplay(), entity == null ? null : ExtMath.floord(entity.posX), entity == null ? null : ExtMath.floord(entity.posY), entity == null ? null : ExtMath.floord(entity.posZ));
}
}
}

4
server/src/main/java/server/command/commands/CommandPotion.java
View file

@ -37,9 +37,9 @@ public class CommandPotion extends Command {
entity.addEffect(effect);
}
if(type.isInstant() || duration == 0)
exec.log("%s an %s gegeben", type.getDisplay(strength - 1), entity.getCommandName());
exec.log("%s an %s gegeben", type.getDisplay(strength - 1), entity.getRawName());
else
exec.log("%s für %d Sekunden an %s gegeben", type.getDisplay(strength - 1), duration, entity.getCommandName());
exec.log("%s für %d Sekunden an %s gegeben", type.getDisplay(strength - 1), duration, entity.getRawName());
done++;
}
}

2
server/src/main/java/server/command/commands/CommandRemove.java
View file

@ -26,7 +26,7 @@ public class CommandRemove extends Command {
entity.kill();
else
entity.setDead();
exec.log(kill ? "%s getötet" : "%s entfernt", entity.getCommandName());
exec.log(kill ? "%s getötet" : "%s entfernt", entity.getRawName());
done++;
}
}

2
server/src/main/java/server/command/commands/CommandRepair.java
View file

@ -48,7 +48,7 @@ public class CommandRepair extends Command {
rep++;
}
if(rep > 0) {
exec.log("%d " + (rep == 1 ? "Gegenstand" : "Gegenstände") + " im Inventar von %s wurde" + (rep == 1 ? "" : "n") + " repariert", rep, player.getCommandName());
exec.log("%d " + (rep == 1 ? "Gegenstand" : "Gegenstände") + " im Inventar von %s wurde" + (rep == 1 ? "" : "n") + " repariert", rep, player.getRawName());
done++;
}
repaired += rep;

2
server/src/main/java/server/command/commands/CommandReturn.java
View file

@ -23,7 +23,7 @@ public class CommandReturn extends Command {
Position pos = ((Player)player.connection).getLastTeleport();
if(pos != null) {
player.teleport(pos);
exec.log("%s zum letzten Punkt (%d, %d, %d in %s) teleportiert", player.getCommandName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
exec.log("%s zum letzten Punkt (%d, %d, %d in %s) teleportiert", player.getRawName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
done++;
}
}

2
server/src/main/java/server/command/commands/CommandTele.java
View file

@ -28,7 +28,7 @@ public class CommandTele extends Command {
public Object exec(CommandEnvironment env, Executor exec, Vec3 position, Dimension dim, Double yaw, Double pitch, List<Entity> entities) {
for(Entity entity : entities) {
entity.teleport(position.xCoord, position.yCoord, position.zCoord, yaw == null ? entity.rotYaw : yaw.floatValue(), pitch == null ? entity.rotPitch : pitch.floatValue(), dim);
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getCommandName(), ExtMath.floord(position.xCoord), ExtMath.floord(position.yCoord), ExtMath.floord(position.zCoord), dim.getDisplay());
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getRawName(), ExtMath.floord(position.xCoord), ExtMath.floord(position.yCoord), ExtMath.floord(position.zCoord), dim.getDisplay());
}
return entities.size();
}

2
server/src/main/java/server/command/commands/CommandTp.java
View file

@ -22,7 +22,7 @@ public class CommandTp extends Command {
Position pos = target.getPos();
for(Entity entity : entities) {
entity.teleport(pos);
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getCommandName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getRawName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
}
return entities.size();
}

2
server/src/main/java/server/command/commands/CommandTphere.java
View file

@ -23,7 +23,7 @@ public class CommandTphere extends Command {
throw new RunException("Keine Position zum Teleportieren vorhanden");
for(Entity entity : entities) {
entity.teleport(pos);
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getCommandName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getRawName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
}
return entities.size();
}

2
server/src/main/java/server/command/commands/CommandWarp.java
View file

@ -45,7 +45,7 @@ public class CommandWarp extends Command {
// }
for(Entity entity : entities) {
entity.teleport(pos);
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getCommandName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getRawName(), (int)pos.x(), (int)pos.y(), (int)pos.z(), pos.getDimension().getDisplay());
}
return entities.size();
}

2
server/src/main/java/server/command/commands/CommandWorld.java
View file

@ -23,7 +23,7 @@ public class CommandWorld extends Command {
for(Entity entity : entities) {
BlockPos pos = adjust(world, entity.getPosition());
entity.teleport(pos, world);
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getCommandName(), pos.getX(), pos.getY(), pos.getZ(), world.dimension.getDisplay());
exec.log("%s nach %d, %d, %d in %s teleportiert", entity.getRawName(), pos.getX(), pos.getY(), pos.getZ(), world.dimension.getDisplay());
}
return entities.size();
}

10
server/src/main/java/server/network/Player.java
View file

@ -1696,10 +1696,10 @@ public class Player extends User implements Executor, IPlayer
Player target = this.server.getPlayer(space < 0 ? line.substring(1) : line.substring(1, space));
if(target == null)
return false;
target.addChat(this.entity.getColoredName(Color.LIGHT_GRAY) + " -> " + target.entity.getColoredName(Color.LIGHT_GRAY) + " " +
target.addChat(this.entity.getEnclosedName(Color.LIGHT_GRAY) + " -> " + target.entity.getEnclosedName(Color.LIGHT_GRAY) + " " +
line);
if(target != this)
this.addChat(target.entity.getColoredName(Color.LIGHT_GRAY) + " -> " + this.entity.getColoredName(Color.LIGHT_GRAY) + " " +
this.addChat(target.entity.getEnclosedName(Color.LIGHT_GRAY) + " -> " + this.entity.getEnclosedName(Color.LIGHT_GRAY) + " " +
line);
return true;
}
@ -1710,7 +1710,7 @@ public class Player extends User implements Executor, IPlayer
String str = line.substring(1).trim();
if(str.isEmpty())
return false;
this.server.sendPacket(new SPacketMessage(String.format(Color.LIGHT_GRAY + "* %s %s", this.entity.getColoredName(Color.LIGHT_GRAY), str), Type.CHAT));
this.server.sendPacket(new SPacketMessage(String.format(Color.LIGHT_GRAY + "* %s %s", this.entity.getEnclosedName(Color.LIGHT_GRAY), str), Type.CHAT));
return true;
}
@ -1940,7 +1940,7 @@ public class Player extends User implements Executor, IPlayer
case CHAT:
if(!this.sendPlayer(msg) && !this.sendEmote(msg))
this.server.sendPacket(new SPacketMessage(String.format("%s %s", this.entity.getColoredName(Color.LIGHT_GRAY), msg), Type.CHAT));
this.server.sendPacket(new SPacketMessage(String.format("%s %s", this.entity.getEnclosedName(Color.LIGHT_GRAY), msg), Type.CHAT));
break;
case DISPLAY:
@ -3061,7 +3061,7 @@ public class Player extends User implements Executor, IPlayer
}
public String getEntityName() {
return this.getPresentEntity() == null ? this.getUser() : this.getPresentEntity().getCommandName();
return this.getPresentEntity() == null ? this.getUser() : this.getPresentEntity().getRawName();
}
// public void processCmdBlock(CPacketCmdBlock packetIn) {