whitebelyash/griefus
1
0
Fork 0
forked from zhdev/griefus
Code Pull requests Activity

Translate item/block/entity names in lookups/inspector results

Browse source
This commit is contained in:
whitebelyash 2026-02-08 22:04:41 +04:00
parent d0fe67d988
commit 540525fee2
4 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/net/coreprotect/command/lookup/StandardLookupThread.java
View file

@ -289,7 +289,11 @@ public class StandardLookupThread implements Runnable {
String rbd = ((Integer.parseInt(data[8]) == 2 || Integer.parseInt(data[8]) == 3) ? Color.STRIKETHROUGH : ""); String rbd = ((Integer.parseInt(data[8]) == 2 || Integer.parseInt(data[8]) == 3) ? Color.STRIKETHROUGH : "");
String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true); String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true);
Material blockType = ItemUtils.itemFilter(MaterialUtils.getType(dtype), (Integer.parseInt(data[13]) == 0)); Material blockType = ItemUtils.itemFilter(MaterialUtils.getType(dtype), (Integer.parseInt(data[13]) == 0));
String dname = StringUtils.nameFilter(blockType.name().toLowerCase(Locale.ROOT), ddata);
// Griefus begin
//String dname = StringUtils.nameFilter(blockType.name().toLowerCase(Locale.ROOT), ddata);
String dname = MaterialUtils.asTranslatable(blockType);
// Griefus end
byte[] metadata = data[11] == null ? null : data[11].getBytes(StandardCharsets.ISO_8859_1); byte[] metadata = data[11] == null ? null : data[11].getBytes(StandardCharsets.ISO_8859_1);
String tooltip = ItemUtils.getEnchantments(metadata, dtype, amount); String tooltip = ItemUtils.getEnchantments(metadata, dtype, amount);
@ -365,13 +369,19 @@ public class StandardLookupThread implements Runnable {
isPlayer = true; isPlayer = true;
} }
else { else {
dname = EntityUtils.getEntityType(dtype).name(); // Griefus begin
// dname = EntityUtils.getEntityType(dtype).name();
dname = EntityUtils.asTranslatable(EntityUtils.getEntityType(dtype));
// Griefus end
} }
} }
else { else {
dname = MaterialUtils.getType(dtype).name().toLowerCase(Locale.ROOT); // Griefus begin
dname = StringUtils.nameFilter(dname, ddata); //dname = MaterialUtils.getType(dtype).name().toLowerCase(Locale.ROOT);
//dname = StringUtils.nameFilter(dname, ddata);
dname = MaterialUtils.asTranslatable(MaterialUtils.getType(dtype));
} }
/*
if (dname.length() > 0 && !isPlayer) { if (dname.length() > 0 && !isPlayer) {
dname = "minecraft:" + dname.toLowerCase(Locale.ROOT) + ""; dname = "minecraft:" + dname.toLowerCase(Locale.ROOT) + "";
} }
@ -381,6 +391,8 @@ public class StandardLookupThread implements Runnable {
String[] blockNameSplit = dname.split(":"); String[] blockNameSplit = dname.split(":");
dname = blockNameSplit[1]; dname = blockNameSplit[1];
} }
*/
// Griefus end
// Functions.sendMessage(player2, timeago+" " + ChatColors.WHITE + "- " + ChatColors.DARK_AQUA+rbd+""+dplayer+" " + ChatColors.WHITE+rbd+""+a+" " + ChatColors.DARK_AQUA+rbd+"#"+dtype+ChatColors.WHITE + ". " + ChatColors.GREY + "(x"+x+"/y"+y+"/z"+z+")"); // Functions.sendMessage(player2, timeago+" " + ChatColors.WHITE + "- " + ChatColors.DARK_AQUA+rbd+""+dplayer+" " + ChatColors.WHITE+rbd+""+a+" " + ChatColors.DARK_AQUA+rbd+"#"+dtype+ChatColors.WHITE + ". " + ChatColors.GREY + "(x"+x+"/y"+y+"/z"+z+")");

27
src/main/java/net/coreprotect/database/lookup/BlockLookup.java
View file

@ -115,24 +115,30 @@ public class BlockLookup {
String target; String target;
if (resultAction == 3) { if (resultAction == 3) {
target = EntityUtils.getEntityType(resultType).name(); // Griefus begin
//target = EntityUtils.getEntityType(resultType).name();
target = EntityUtils.asTranslatable(EntityUtils.getEntityType(resultType));
// Griefus end
} }
else { else {
Material resultMaterial = MaterialUtils.getType(resultType); Material resultMaterial = MaterialUtils.getType(resultType);
if (resultMaterial == null) { if (resultMaterial == null) {
resultMaterial = Material.AIR; resultMaterial = Material.AIR;
} }
target = StringUtils.nameFilter(resultMaterial.name().toLowerCase(Locale.ROOT), resultData); // Griefus begin
target = "minecraft:" + target.toLowerCase(Locale.ROOT); //target = StringUtils.nameFilter(resultMaterial.name().toLowerCase(Locale.ROOT), resultData);
//target = "minecraft:" + target.toLowerCase(Locale.ROOT);
target = MaterialUtils.asTranslatable(resultMaterial);
} }
if (target.length() > 0) { /*if (target.length() > 0) {
target = "" + target + ""; target = "" + target + "";
} }*/
// Hide "minecraft:" for now. // Hide "minecraft:" for now. - do not!!
if (target.startsWith("minecraft:")) { /*if (target.startsWith("minecraft:")) {
target = target.split(":")[1]; target = target.split(":")[1];
} } */
// Griefus end
resultTextBuilder.append(timeAgo + " " + separator + " ").append(Phrase.build(phrase, Color.WHITE + Color.BOLD + rbFormat + resultUser + Color.RESET + rbFormat, Color.GOLD + rbFormat + target + Color.WHITE, selector)).append("\n"); resultTextBuilder.append(timeAgo + " " + separator + " ").append(Phrase.build(phrase, Color.WHITE + Color.BOLD + rbFormat + resultUser + Color.RESET + rbFormat, Color.GOLD + rbFormat + target + Color.WHITE, selector)).append("\n");
PluginChannelListener.getInstance().sendData(commandSender, resultTime, phrase, selector, resultUser, target, -1, x, y, z, worldId, rbFormat, false, tag.contains("+")); PluginChannelListener.getInstance().sendData(commandSender, resultTime, phrase, selector, resultUser, target, -1, x, y, z, worldId, rbFormat, false, tag.contains("+"));
@ -155,7 +161,10 @@ public class BlockLookup {
// resultText = Color.WHITE + "No block data found at " + Color.ITALIC + "x" + x + "/y" + y + "/z" + z + "."; // resultText = Color.WHITE + "No block data found at " + Color.ITALIC + "x" + x + "/y" + y + "/z" + z + ".";
resultText = Phrase.build(Phrase.NO_DATA_LOCATION, Selector.FIRST); resultText = Phrase.build(Phrase.NO_DATA_LOCATION, Selector.FIRST);
if (!blockName.equals("air") && !blockName.equals("cave_air")) { if (!blockName.equals("air") && !blockName.equals("cave_air")) {
resultText = Phrase.build(Phrase.NO_DATA, Color.ITALIC + block.getType().name().toLowerCase(Locale.ROOT) + Color.WHITE) + "\n"; // Griefus begin
//resultText = Phrase.build(Phrase.NO_DATA, Color.ITALIC + block.getType().name().toLowerCase(Locale.ROOT) + Color.WHITE) + "\n";
resultText = Phrase.build(Phrase.NO_DATA, Color.ITALIC + MaterialUtils.asTranslatable(block.getType()) + Color.WHITE) + "\n";
// Griefus end
} }
} }
} }

5
src/main/java/net/coreprotect/database/lookup/ChestTransactionLookup.java
View file

@ -112,6 +112,9 @@ public class ChestTransactionLookup {
if (resultMaterial == null) { if (resultMaterial == null) {
resultMaterial = Material.AIR; resultMaterial = Material.AIR;
} }
// Griefus begin
String target = MaterialUtils.asTranslatable(resultMaterial);
/*
String target = resultMaterial.name().toLowerCase(Locale.ROOT); String target = resultMaterial.name().toLowerCase(Locale.ROOT);
target = StringUtils.nameFilter(target, resultData); target = StringUtils.nameFilter(target, resultData);
if (target.length() > 0) { if (target.length() > 0) {
@ -122,6 +125,8 @@ public class ChestTransactionLookup {
if (target.startsWith("minecraft:")) { if (target.startsWith("minecraft:")) {
target = target.split(":")[1]; target = target.split(":")[1];
} }
*/
// Griefus end
result.add(new StringBuilder(timeAgo + " " + tag + " " + Phrase.build(Phrase.LOOKUP_CONTAINER, Color.DARK_AQUA + rbFormat + resultUser + Color.WHITE + rbFormat, "x" + resultAmount, ChatUtils.createTooltip(Color.DARK_AQUA + rbFormat + target, tooltip) + Color.WHITE, selector)).toString()); result.add(new StringBuilder(timeAgo + " " + tag + " " + Phrase.build(Phrase.LOOKUP_CONTAINER, Color.DARK_AQUA + rbFormat + resultUser + Color.WHITE + rbFormat, "x" + resultAmount, ChatUtils.createTooltip(Color.DARK_AQUA + rbFormat + target, tooltip) + Color.WHITE, selector)).toString());
PluginChannelListener.getInstance().sendData(commandSender, resultTime, Phrase.LOOKUP_CONTAINER, selector, resultUser, target, resultAmount, x, y, z, worldId, rbFormat, true, tag.contains("+")); PluginChannelListener.getInstance().sendData(commandSender, resultTime, Phrase.LOOKUP_CONTAINER, selector, resultUser, target, resultAmount, x, y, z, worldId, rbFormat, true, tag.contains("+"));

5
src/main/java/net/coreprotect/database/lookup/InteractionLookup.java
View file

@ -100,6 +100,9 @@ public class InteractionLookup {
if (resultMaterial == null) { if (resultMaterial == null) {
resultMaterial = Material.AIR; resultMaterial = Material.AIR;
} }
// Griefus begin
String target = MaterialUtils.asTranslatable(resultMaterial);
/*
String target = resultMaterial.name().toLowerCase(Locale.ROOT); String target = resultMaterial.name().toLowerCase(Locale.ROOT);
target = StringUtils.nameFilter(target, resultData); target = StringUtils.nameFilter(target, resultData);
if (target.length() > 0) { if (target.length() > 0) {
@ -110,6 +113,8 @@ public class InteractionLookup {
if (target.startsWith("minecraft:")) { if (target.startsWith("minecraft:")) {
target = target.split(":")[1]; target = target.split(":")[1];
} }
*/
// Griefus end
resultBuilder.append(timeAgo + " " + Color.WHITE + "- ").append(Phrase.build(Phrase.LOOKUP_INTERACTION, Color.DARK_AQUA + rbFormat + resultUser + Color.WHITE + rbFormat, Color.DARK_AQUA + rbFormat + target + Color.WHITE, Selector.FIRST)).append("\n"); resultBuilder.append(timeAgo + " " + Color.WHITE + "- ").append(Phrase.build(Phrase.LOOKUP_INTERACTION, Color.DARK_AQUA + rbFormat + resultUser + Color.WHITE + rbFormat, Color.DARK_AQUA + rbFormat + target + Color.WHITE, Selector.FIRST)).append("\n");
PluginChannelListener.getInstance().sendData(commandSender, resultTime, Phrase.LOOKUP_INTERACTION, Selector.FIRST, resultUser, target, -1, x, y, z, worldId, rbFormat, false, false); PluginChannelListener.getInstance().sendData(commandSender, resultTime, Phrase.LOOKUP_INTERACTION, Selector.FIRST, resultUser, target, -1, x, y, z, worldId, rbFormat, false, false);