diff --git a/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java index aaefbb6..ea491d9 100644 --- a/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { @@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java b/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java index 6920aa1..93e68b2 100644 --- a/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { @@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java b/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java index d16315a..86353c2 100644 --- a/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { @@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java b/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java index fba5f9c..6f36b98 100644 --- a/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { @@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java b/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java index 3238d83..13eaec5 100644 --- a/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { @@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java b/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java index 1043d68..f08825d 100644 --- a/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { @@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") diff --git a/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java b/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java index c82bbbe..42c0cdf 100644 --- a/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java +++ b/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { @@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn } private void updateName(EntityHologram hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "") 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 04685d2..288b1f2 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 @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class TileEntityChunkLoader extends TileEntity implements ITickable, ITileEntityChunkLoader { @@ -116,8 +117,9 @@ 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}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .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 7b00e52..7c818ec 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 @@ -19,6 +19,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class TileEntityChunkLoader extends TileEntity implements ITickable, ITileEntityChunkLoader { @@ -130,9 +131,9 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable } private void updateName(EntityHolograms hologram, String line) { - assert chunkLoader.getWhoPlaced().getName() != null; + String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse(""); hologram.setHologramName(line - .replace("{0}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .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 bfb6751..96d2ae5 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 @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; public final class TileEntityChunkLoader extends TileEntity implements IUpdatePlayerListBox, ITileEntityChunkLoader { @@ -116,8 +117,9 @@ 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}", chunkLoader.getWhoPlaced().getName()) + .replace("{0}", placerName) .replace("{1}", daysAmount + "") .replace("{2}", hoursAmount + "") .replace("{3}", minutesAmount + "")