From 901f630d899845b981d30d57b7880a105cc15d9e Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Fri, 15 Mar 2024 11:55:05 +0200 Subject: [PATCH] Cache player names for holograms of loaders (#88) --- .../nms/v1_12_R1/loader/TileEntityChunkLoader.java | 6 ++++-- .../nms/v1_16_R3/loader/TileEntityChunkLoader.java | 6 ++++-- .../nms/v1_17/loader/ChunkLoaderBlockEntity.java | 6 ++++-- .../nms/v1_18/loader/ChunkLoaderBlockEntity.java | 6 ++++-- .../nms/v1_19/loader/ChunkLoaderBlockEntity.java | 6 ++++-- .../nms/v1_20_1/loader/ChunkLoaderBlockEntity.java | 6 ++++-- .../nms/v1_20_2/loader/ChunkLoaderBlockEntity.java | 6 ++++-- .../nms/v1_20_3/loader/ChunkLoaderBlockEntity.java | 6 ++++-- .../nms/v1_8_R3/loader/TileEntityChunkLoader.java | 6 ++++-- 9 files changed, 36 insertions(+), 18 deletions(-) diff --git a/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java b/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java index 288b1f2..6d1187c 100644 --- a/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java +++ b/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java @@ -27,6 +27,7 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable public final List holograms = new ArrayList<>(); private final WChunkLoader chunkLoader; private final Block loaderBlock; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -67,6 +68,8 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } @Override @@ -117,9 +120,8 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable } private void updateName(EntityHolograms hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java b/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java index 7c818ec..a7999a7 100644 --- a/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java +++ b/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java @@ -28,6 +28,7 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable public final List holograms = new ArrayList<>(); private final WChunkLoader chunkLoader; private final Block loaderBlock; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -75,6 +76,8 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } @Override @@ -131,9 +134,8 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable } private void updateName(EntityHolograms hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_17/src/main/java/com/bgsoftware/wildloaders/nms/v1_17/loader/ChunkLoaderBlockEntity.java b/NMS/v1_17/src/main/java/com/bgsoftware/wildloaders/nms/v1_17/loader/ChunkLoaderBlockEntity.java index 71f3e63..67942f2 100644 --- a/NMS/v1_17/src/main/java/com/bgsoftware/wildloaders/nms/v1_17/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1_17/src/main/java/com/bgsoftware/wildloaders/nms/v1_17/loader/ChunkLoaderBlockEntity.java @@ -30,6 +30,7 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn private final ChunkLoaderBlockEntityTicker ticker; private final ServerLevel serverLevel; private final BlockPos blockPos; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -75,6 +76,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } public void tick() { @@ -133,9 +136,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_18/src/main/java/com/bgsoftware/wildloaders/nms/v1_18/loader/ChunkLoaderBlockEntity.java b/NMS/v1_18/src/main/java/com/bgsoftware/wildloaders/nms/v1_18/loader/ChunkLoaderBlockEntity.java index 8517e03..191b3e6 100644 --- a/NMS/v1_18/src/main/java/com/bgsoftware/wildloaders/nms/v1_18/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1_18/src/main/java/com/bgsoftware/wildloaders/nms/v1_18/loader/ChunkLoaderBlockEntity.java @@ -30,6 +30,7 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn private final ChunkLoaderBlockEntityTicker ticker; private final ServerLevel serverLevel; private final BlockPos blockPos; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -75,6 +76,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } public void tick() { @@ -133,9 +136,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_19/src/main/java/com/bgsoftware/wildloaders/nms/v1_19/loader/ChunkLoaderBlockEntity.java b/NMS/v1_19/src/main/java/com/bgsoftware/wildloaders/nms/v1_19/loader/ChunkLoaderBlockEntity.java index fa87a6f..bd9c734 100644 --- a/NMS/v1_19/src/main/java/com/bgsoftware/wildloaders/nms/v1_19/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1_19/src/main/java/com/bgsoftware/wildloaders/nms/v1_19/loader/ChunkLoaderBlockEntity.java @@ -30,6 +30,7 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn private final ChunkLoaderBlockEntityTicker ticker; private final ServerLevel serverLevel; private final BlockPos blockPos; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -75,6 +76,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } public void tick() { @@ -133,9 +136,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_20_1/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_1/loader/ChunkLoaderBlockEntity.java b/NMS/v1_20_1/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_1/loader/ChunkLoaderBlockEntity.java index f343766..65935c7 100644 --- a/NMS/v1_20_1/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_1/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1_20_1/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_1/loader/ChunkLoaderBlockEntity.java @@ -30,6 +30,7 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn private final ChunkLoaderBlockEntityTicker ticker; private final ServerLevel serverLevel; private final BlockPos blockPos; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -75,6 +76,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } public void tick() { @@ -133,9 +136,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_20_2/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_2/loader/ChunkLoaderBlockEntity.java b/NMS/v1_20_2/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_2/loader/ChunkLoaderBlockEntity.java index 4961da0..39a8a30 100644 --- a/NMS/v1_20_2/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_2/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1_20_2/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_2/loader/ChunkLoaderBlockEntity.java @@ -30,6 +30,7 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn private final ChunkLoaderBlockEntityTicker ticker; private final ServerLevel serverLevel; private final BlockPos blockPos; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -75,6 +76,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } public void tick() { @@ -133,9 +136,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_20_3/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_3/loader/ChunkLoaderBlockEntity.java b/NMS/v1_20_3/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_3/loader/ChunkLoaderBlockEntity.java index 9a62fe3..b2efbdb 100644 --- a/NMS/v1_20_3/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_3/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1_20_3/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_3/loader/ChunkLoaderBlockEntity.java @@ -30,6 +30,7 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn private final ChunkLoaderBlockEntityTicker ticker; private final ServerLevel serverLevel; private final BlockPos blockPos; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -75,6 +76,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } public void tick() { @@ -133,9 +136,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java b/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java index 96d2ae5..92876f1 100644 --- a/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java +++ b/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java @@ -27,6 +27,7 @@ public final class TileEntityChunkLoader extends TileEntity implements IUpdatePl public final List holograms = new ArrayList<>(); private final WChunkLoader chunkLoader; private final Block loaderBlock; + private final String cachedPlacerName; private short currentTick = 20; private short daysAmount, hoursAmount, minutesAmount, secondsAmount; @@ -67,6 +68,8 @@ public final class TileEntityChunkLoader extends TileEntity implements IUpdatePl currentY += 0.23; holograms.add(hologram); } + + this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse(""); } @Override @@ -117,9 +120,8 @@ public final class TileEntityChunkLoader extends TileEntity implements IUpdatePl } private void updateName(EntityHolograms hologram, String line) { - String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", placerName) + .replace("{0}", this.cachedPlacerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "")