Add missing data conversion for BlockStateKeys (#3864)

* Add missing data conversion for BlockStateKeys * Update src/main/java/org/spongepowered/common/data/provider/block/state/BlockStateDataProvider.java Co-authored-by: Joni Aromaa <me@joniaromaa.fi> --------- Co-authored-by: Joni Aromaa <me@joniaromaa.fi>
SpongePowered · Jun 12, 2023 · 995deec · 995deec
1 parent c2e5344
commit 995deec
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/org/spongepowered/common/data/provider/block/state/BlockStateDataProvider.java b/src/main/java/org/spongepowered/common/data/provider/block/state/BlockStateDataProvider.java
@@ -30,6 +30,7 @@
 import org.spongepowered.api.data.BlockStateKeys;
 import org.spongepowered.api.data.Key;
 import org.spongepowered.api.data.value.Value;
+import org.spongepowered.api.state.StateProperty;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
 
 public final class BlockStateDataProvider {
@@ -134,13 +135,13 @@ public static void register(final DataProviderRegistrator registrator) {
     }
 
     // @formatter:off
-    private static <T, V extends Comparable<V>> void registerProperty(final DataProviderRegistrator registrator, final Key<Value<T>> key, final Property<V> property) {
+    private static <T extends Comparable<T>, V extends Comparable<V>> void registerProperty(final DataProviderRegistrator registrator, final Key<Value<T>> key, final Property<V> property) {
 
         registrator.asImmutable(BlockState.class)
                 .create(key)
                     .supports(bs -> bs.getOptionalValue(property).isPresent())
-                    .get(bs -> (T) bs.getOptionalValue(property).orElse(null))
-                    .set((bs, v) -> bs.setValue(property, (V) v));
+                    .get(bs -> ((org.spongepowered.api.block.BlockState) bs).stateProperty((StateProperty<T>) property).orElse(null))
+                    .set((bs, v) -> (BlockState) ((org.spongepowered.api.block.BlockState) bs).withStateProperty((StateProperty<T>) property, v).orElse((org.spongepowered.api.block.BlockState) bs));
     }
     // @formatter:on