From c9733948b36578015e4dd8f938d37d5fec34273c Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 27 Apr 2024 10:23:04 +0200
Subject: [PATCH] Use raw data filler in 1.12->1.13

---
 .../viaversion/api/type/types/misc/DynamicType.java   | 11 ++++++++++-
 .../protocol1_13to1_12_2/Protocol1_13To1_12_2.java    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/DynamicType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/DynamicType.java
index 149bcad1f..76d95fd70 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/DynamicType.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/DynamicType.java
@@ -22,6 +22,7 @@
  */
 package com.viaversion.viaversion.api.type.types.misc;
 
+import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.data.FullMappings;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.type.Type;
@@ -58,6 +59,10 @@ public abstract class DynamicType<T extends IdHolder> extends Type<T> {
         }
     }
 
+    public RawDataFiller rawFiller() {
+        return new RawDataFiller();
+    }
+
     public final class DataFiller {
 
         private final FullMappings mappings;
@@ -65,6 +70,7 @@ public abstract class DynamicType<T extends IdHolder> extends Type<T> {
 
         private DataFiller(final Protocol<?, ?, ?, ?> protocol, final boolean useMappedNames) {
             this.mappings = mappings(protocol);
+            Preconditions.checkNotNull(mappings, "Mappings for %s are null", protocol.getClass());
             this.useMappedNames = useMappedNames;
         }
 
@@ -72,8 +78,11 @@ public abstract class DynamicType<T extends IdHolder> extends Type<T> {
             readers.put(useMappedNames ? mappings.mappedId(identifier) : mappings.id(identifier), reader);
             return this;
         }
+    }
 
-        public DataFiller reader(final int id, final DataReader<T> reader) {
+    public final class RawDataFiller {
+
+        public RawDataFiller reader(final int id, final DataReader<T> reader) {
             readers.put(id, reader);
             return this;
         }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
index b6dee4775..23ac3b6a1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
@@ -845,7 +845,7 @@ public class Protocol1_13To1_12_2 extends AbstractProtocol<ClientboundPackets1_1
         RecipeData.init();
         BlockIdData.init();
 
-        Types1_13.PARTICLE.filler(this)
+        Types1_13.PARTICLE.rawFiller()
                 .reader(3, ParticleType.Readers.BLOCK)
                 .reader(20, ParticleType.Readers.DUST)
                 .reader(11, ParticleType.Readers.DUST)