fix!: Fix DataAttachmentLookup#get initializing the attachment on NeoForge, but not on Fabric. Introduce getOrCreate as an explicit alternative. get now only returns existing data on NeoForge, so this is a breaking change. However, since this never worked right in multi-loader I doubt anyone is affected by this.

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/balm/platform/attachment/DataAttachmentLookup.java

@@ -11,6 +11,8 @@ public interface DataAttachmentLookup<T> {
     @Nullable
     T get(Player player);
 
+    T getOrCreate(Player player);
+
     boolean has(Player player);
 
     @Nullable
@@ -22,6 +24,8 @@ public interface DataAttachmentLookup<T> {
     @Nullable
     T get(Level level);
 
+    T getOrCreate(Level level);
+
     boolean has(Level level);
 
     @Nullable
@@ -33,6 +37,8 @@ public interface DataAttachmentLookup<T> {
     @Nullable
     T get(Entity entity);
 
+    T getOrCreate(Entity entity);
+
     boolean has(Entity entity);
 
     @Nullable
@@ -44,6 +50,8 @@ public interface DataAttachmentLookup<T> {
     @Nullable
     T get(BlockEntity blockEntity);
 
+    T getOrCreate(BlockEntity blockEntity);
+
     boolean has(BlockEntity blockEntity);
 
     @Nullable
@@ -55,6 +63,8 @@ public interface DataAttachmentLookup<T> {
     @Nullable
     T get(ChunkAccess chunk);
 
+    T getOrCreate(ChunkAccess chunk);
+
     boolean has(ChunkAccess chunk);
 
     @Nullable

fabric/src/main/java/net/blay09/mods/balm/fabric/platform/attachment/internal/FabricDataAttachmentLookup.java

@@ -21,6 +21,11 @@ public FabricDataAttachmentLookup(AttachmentType<T> type) {
         return player.getAttached(type);
     }
 
+    @Override
+    public @Nullable T getOrCreate(Player player) {
+        return player.getAttachedOrCreate(type);
+    }
+
     @Override
     public boolean has(Player player) {
         return player.hasAttached(type);
@@ -41,6 +46,11 @@ public boolean has(Player player) {
         return level.getAttached(type);
     }
 
+    @Override
+    public @Nullable T getOrCreate(Level level) {
+        return level.getAttachedOrCreate(type);
+    }
+
     @Override
     public boolean has(Level level) {
         return level.hasAttached(type);
@@ -61,6 +71,11 @@ public boolean has(Level level) {
         return entity.getAttached(type);
     }
 
+    @Override
+    public @Nullable T getOrCreate(Entity entity) {
+        return entity.getAttachedOrCreate(type);
+    }
+
     @Override
     public boolean has(Entity entity) {
         return entity.hasAttached(type);
@@ -81,6 +96,11 @@ public boolean has(Entity entity) {
         return blockEntity.getAttached(type);
     }
 
+    @Override
+    public @Nullable T getOrCreate(BlockEntity blockEntity) {
+        return blockEntity.getAttachedOrCreate(type);
+    }
+
     @Override
     public boolean has(BlockEntity blockEntity) {
         return blockEntity.hasAttached(type);
@@ -101,6 +121,11 @@ public boolean has(BlockEntity blockEntity) {
         return chunk.getAttached(type);
     }
 
+    @Override
+    public @Nullable T getOrCreate(ChunkAccess chunk) {
+        return chunk.getAttachedOrCreate(type);
+    }
+
     @Override
     public boolean has(ChunkAccess chunk) {
         return chunk.hasAttached(type);

neoforge/src/main/java/net/blay09/mods/balm/neoforge/platform/attachment/internal/NeoForgeDataAttachmentLookup.java

@@ -20,6 +20,11 @@ public NeoForgeDataAttachmentLookup(Holder<?> type) {
 
     @Override
     public @Nullable T get(Player player) {
+        return player.getExistingDataOrNull(type::value);
+    }
+
+    @Override
+    public T getOrCreate(Player player) {
         return player.getData(type::value);
     }
 
@@ -40,6 +45,11 @@ public boolean has(Player player) {
 
     @Override
     public @Nullable T get(Level level) {
+        return level.getExistingDataOrNull(type::value);
+    }
+
+    @Override
+    public T getOrCreate(Level level) {
         return level.getData(type::value);
     }
 
@@ -60,6 +70,11 @@ public boolean has(Level level) {
 
     @Override
     public @Nullable T get(Entity entity) {
+        return entity.getExistingDataOrNull(type::value);
+    }
+
+    @Override
+    public T getOrCreate(Entity entity) {
         return entity.getData(type::value);
     }
 
@@ -80,6 +95,11 @@ public boolean has(Entity entity) {
 
     @Override
     public @Nullable T get(BlockEntity blockEntity) {
+        return blockEntity.getExistingDataOrNull(type::value);
+    }
+
+    @Override
+    public T getOrCreate(BlockEntity blockEntity) {
         return blockEntity.getData(type::value);
     }
 
@@ -100,6 +120,11 @@ public boolean has(BlockEntity blockEntity) {
 
     @Override
     public @Nullable T get(ChunkAccess chunk) {
+        return chunk.getExistingDataOrNull(type::value);
+    }
+
+    @Override
+    public T getOrCreate(ChunkAccess chunk) {
         return chunk.getData(type::value);
     }