Upstream/HolographicDisplays
1
0
Fork 0
mirror of https://github.com/filoghost/HolographicDisplays.git synced 2024-12-27 03:07:54 +01:00
Code Issues Projects Releases Wiki Activity

Raise hologram line character limit

Browse Source
This commit is contained in:
filoghost 2022-03-12 00:15:51 +01:00
parent 54bc45ebb9
commit 559cba600c
14 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/DataWatcherPacketBuilder.java
View File

@ -12,6 +12,8 @@ import org.bukkit.inventory.ItemStack;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -34,7 +36,7 @@ abstract class DataWatcherPacketBuilder<T> {
if (customName == null) { if (customName == null) {
customName = ""; customName = "";
} }
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this; return this;
} }

4
nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/DataWatcherPacketBuilder.java
View File

@ -11,6 +11,8 @@ import org.bukkit.inventory.ItemStack;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -33,7 +35,7 @@ abstract class DataWatcherPacketBuilder<T> {
if (customName == null) { if (customName == null) {
customName = ""; customName = "";
} }
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this; return this;
} }

4
nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/DataWatcherPacketBuilder.java
View File

@ -11,6 +11,8 @@ import org.bukkit.inventory.ItemStack;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -33,7 +35,7 @@ abstract class DataWatcherPacketBuilder<T> {
if (customName == null) { if (customName == null) {
customName = ""; customName = "";
} }
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this; return this;
} }

4
nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false)[0]); return Optional.of(CraftChatMessage.fromString(customName, false)[0]);
} else { } else {

4
nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false)[0]); return Optional.of(CraftChatMessage.fromString(customName, false)[0]);
} else { } else {

4
nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false)[0]); return Optional.of(CraftChatMessage.fromString(customName, false)[0]);
} else { } else {

4
nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false)[0]); return Optional.of(CraftChatMessage.fromString(customName, false)[0]);
} else { } else {

4
nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false)[0]); return Optional.of(CraftChatMessage.fromString(customName, false)[0]);
} else { } else {

4
nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]); return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]);
} else { } else {

4
nms/v1_17_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_17_R1/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]); return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]);
} else { } else {

4
nms/v1_18_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_18_R1/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]); return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]);
} else { } else {

4
nms/v1_18_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_18_R2/DataWatcherPacketBuilder.java
View File

@ -15,6 +15,8 @@ import java.util.Optional;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -40,7 +42,7 @@ abstract class DataWatcherPacketBuilder<T> {
} }
private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) { private Optional<IChatBaseComponent> getCustomNameDataWatcherValue(String customName) {
customName = Strings.truncate(customName, 300); customName = Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH);
if (!Strings.isEmpty(customName)) { if (!Strings.isEmpty(customName)) {
return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]); return Optional.of(CraftChatMessage.fromString(customName, false, true)[0]);
} else { } else {

4
nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/DataWatcherPacketBuilder.java
View File

@ -11,6 +11,8 @@ import org.bukkit.inventory.ItemStack;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -33,7 +35,7 @@ abstract class DataWatcherPacketBuilder<T> {
if (customName == null) { if (customName == null) {
customName = ""; customName = "";
} }
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, Strings.isEmpty(customName) ? (byte) 0 : (byte) 1); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, Strings.isEmpty(customName) ? (byte) 0 : (byte) 1);
return this; return this;
} }

4
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/DataWatcherPacketBuilder.java
View File

@ -12,6 +12,8 @@ import org.bukkit.inventory.ItemStack;
abstract class DataWatcherPacketBuilder<T> { abstract class DataWatcherPacketBuilder<T> {
private static final int MAX_CUSTOM_NAME_LENGTH = 5000;
private final PacketByteBuffer packetByteBuffer; private final PacketByteBuffer packetByteBuffer;
DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) { DataWatcherPacketBuilder(PacketByteBuffer packetByteBuffer) {
@ -34,7 +36,7 @@ abstract class DataWatcherPacketBuilder<T> {
if (customName == null) { if (customName == null) {
customName = ""; customName = "";
} }
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, 300)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME, Strings.truncate(customName, MAX_CUSTOM_NAME_LENGTH));
packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName)); packetByteBuffer.writeDataWatcherEntry(DataWatcherKey.CUSTOM_NAME_VISIBILITY, !Strings.isEmpty(customName));
return this; return this;
} }