diff --git a/src/main/java/net/coreprotect/command/lookup/StandardLookupThread.java b/src/main/java/net/coreprotect/command/lookup/StandardLookupThread.java index a833ba0..fb78926 100644 --- a/src/main/java/net/coreprotect/command/lookup/StandardLookupThread.java +++ b/src/main/java/net/coreprotect/command/lookup/StandardLookupThread.java @@ -286,7 +286,11 @@ public class StandardLookupThread implements Runnable { String rbd = ((Integer.parseInt(data[8]) == 2 || Integer.parseInt(data[8]) == 3) ? Color.STRIKETHROUGH : ""); String timeago = ChatUtils.getTimeSince(Integer.parseInt(time), unixtimestamp, true); 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); String tooltip = ItemUtils.getEnchantments(metadata, dtype, amount); @@ -362,13 +366,19 @@ public class StandardLookupThread implements Runnable { isPlayer = true; } else { - dname = EntityUtils.getEntityType(dtype).name(); + // Griefus begin + // dname = EntityUtils.getEntityType(dtype).name(); + dname = EntityUtils.asTranslatable(EntityUtils.getEntityType(dtype)); + // Griefus end } } else { - dname = MaterialUtils.getType(dtype).name().toLowerCase(Locale.ROOT); - dname = StringUtils.nameFilter(dname, ddata); + // Griefus begin + //dname = MaterialUtils.getType(dtype).name().toLowerCase(Locale.ROOT); + //dname = StringUtils.nameFilter(dname, ddata); + dname = MaterialUtils.asTranslatable(MaterialUtils.getType(dtype)); } + /* if (dname.length() > 0 && !isPlayer) { dname = "minecraft:" + dname.toLowerCase(Locale.ROOT) + ""; } @@ -378,6 +388,8 @@ public class StandardLookupThread implements Runnable { String[] blockNameSplit = dname.split(":"); 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+")"); diff --git a/src/main/java/net/coreprotect/database/lookup/BlockLookup.java b/src/main/java/net/coreprotect/database/lookup/BlockLookup.java index 5603df1..97470f4 100644 --- a/src/main/java/net/coreprotect/database/lookup/BlockLookup.java +++ b/src/main/java/net/coreprotect/database/lookup/BlockLookup.java @@ -109,24 +109,30 @@ public class BlockLookup { String target; if (resultAction == 3) { - target = EntityUtils.getEntityType(resultType).name(); + // Griefus begin + //target = EntityUtils.getEntityType(resultType).name(); + target = EntityUtils.asTranslatable(EntityUtils.getEntityType(resultType)); + // Griefus end } else { Material resultMaterial = MaterialUtils.getType(resultType); if (resultMaterial == null) { resultMaterial = Material.AIR; } - target = StringUtils.nameFilter(resultMaterial.name().toLowerCase(Locale.ROOT), resultData); - target = "minecraft:" + target.toLowerCase(Locale.ROOT); + // Griefus begin + //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 + ""; - } + }*/ - // Hide "minecraft:" for now. - if (target.startsWith("minecraft:")) { + // Hide "minecraft:" for now. - do not!! + /*if (target.startsWith("minecraft:")) { target = target.split(":")[1]; - } + } */ + // Griefus end resultTextBuilder.append(timeAgo + " " + tag + " ").append(Phrase.build(phrase, Color.DARK_AQUA + rbFormat + resultUser + Color.WHITE + rbFormat, Color.DARK_AQUA + 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("+")); @@ -150,7 +156,10 @@ public class BlockLookup { // 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); 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 } } } diff --git a/src/main/java/net/coreprotect/database/lookup/ChestTransactionLookup.java b/src/main/java/net/coreprotect/database/lookup/ChestTransactionLookup.java index 8119a99..cbad978 100644 --- a/src/main/java/net/coreprotect/database/lookup/ChestTransactionLookup.java +++ b/src/main/java/net/coreprotect/database/lookup/ChestTransactionLookup.java @@ -112,6 +112,9 @@ public class ChestTransactionLookup { if (resultMaterial == null) { resultMaterial = Material.AIR; } + // Griefus begin + String target = MaterialUtils.asTranslatable(resultMaterial); + /* String target = resultMaterial.name().toLowerCase(Locale.ROOT); target = StringUtils.nameFilter(target, resultData); if (target.length() > 0) { @@ -122,6 +125,8 @@ public class ChestTransactionLookup { if (target.startsWith("minecraft:")) { 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()); PluginChannelListener.getInstance().sendData(commandSender, resultTime, Phrase.LOOKUP_CONTAINER, selector, resultUser, target, resultAmount, x, y, z, worldId, rbFormat, true, tag.contains("+")); diff --git a/src/main/java/net/coreprotect/database/lookup/InteractionLookup.java b/src/main/java/net/coreprotect/database/lookup/InteractionLookup.java index 20333aa..781ca03 100644 --- a/src/main/java/net/coreprotect/database/lookup/InteractionLookup.java +++ b/src/main/java/net/coreprotect/database/lookup/InteractionLookup.java @@ -100,6 +100,9 @@ public class InteractionLookup { if (resultMaterial == null) { resultMaterial = Material.AIR; } + // Griefus begin + String target = MaterialUtils.asTranslatable(resultMaterial); + /* String target = resultMaterial.name().toLowerCase(Locale.ROOT); target = StringUtils.nameFilter(target, resultData); if (target.length() > 0) { @@ -110,6 +113,8 @@ public class InteractionLookup { if (target.startsWith("minecraft:")) { 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"); PluginChannelListener.getInstance().sendData(commandSender, resultTime, Phrase.LOOKUP_INTERACTION, Selector.FIRST, resultUser, target, -1, x, y, z, worldId, rbFormat, false, false);