Return prior value from set

APDevTeam · Aug 11, 2024 · 55da3e4 · 55da3e4
1 parent 202e5df
commit 55da3e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/craft/BaseCraft.java b/Movecraft/src/main/java/net/countercraft/movecraft/craft/BaseCraft.java
@@ -551,8 +551,8 @@ public void setAudience(@NotNull Audience audience) {
     }
 
     @Override
-    public <T> void setDataTag(final @NotNull CraftDataTagKey<T> tagKey, final T data) {
-        dataTagContainer.set(tagKey, data);
+    public <T> T setDataTag(final @NotNull CraftDataTagKey<T> tagKey, final T data) {
+        return dataTagContainer.set(tagKey, data);
     }
 
     @Override

diff --git a/api/src/main/java/net/countercraft/movecraft/craft/Craft.java b/api/src/main/java/net/countercraft/movecraft/craft/Craft.java
@@ -274,7 +274,7 @@ default void setLastDZ(int dZ){}
 
     void setAudience(Audience audience);
 
-    <T> void setDataTag(@NotNull final CraftDataTagKey<T> tagKey, final T data);
+    <T> T setDataTag(@NotNull final CraftDataTagKey<T> tagKey, final T data);
 
     <T> T getDataTag(@NotNull final CraftDataTagKey<T> tagKey);
 

diff --git a/api/src/main/java/net/countercraft/movecraft/craft/datatag/CraftDataTagContainer.java b/api/src/main/java/net/countercraft/movecraft/craft/datatag/CraftDataTagContainer.java
@@ -47,12 +47,17 @@ public <T> T get(final @NotNull Craft craft, final @NotNull CraftDataTagKey<T> t
      * @param value the value to set for future lookups
      * @param <T> the type of the value
      */
-    public <T> void set(final @NotNull CraftDataTagKey<T> tagKey, final @NotNull T value) {
+    public <T> @Nullable T set(final @NotNull CraftDataTagKey<T> tagKey, final @NotNull T value) {
         if (!CraftDataTagRegistry.INSTANCE.isRegistered(tagKey.key)) {
             throw new IllegalArgumentException(String.format("The provided key %s was not registered.", tagKey));
         }
+        try {
+            //noinspection unchecked
+            return (T) backing.put(tagKey, value);
+        } catch (ClassCastException cce) {
+            throw new IllegalStateException(String.format("The provided key %s has an invalid value type.", tagKey), cce);
+        }
 
-        backing.put(tagKey, value);
     }
 
     public <T> T compute(final @NotNull Craft craft, final @NotNull CraftDataTagKey<T> tagKey, final @NotNull Function<? super T, ? extends T> computation){