Merge pull request #127 from TheNextLvl-net/preserve-properties

Preserve block properties when replacing blocks across all patterns

Author: NonSwag

src/main/java/net/thenextlvl/gopaint/brush/pattern/AnglePattern.java

@@ -28,6 +28,6 @@ public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws W
             >= Math.tan(Math.toRadians(settings().getAngleHeightDifference()))
         ) return false;
 
-        return set.setBlock(extent, getRandomBlockState());
+        return set.setBlock(extent, getRandomBlockState().withProperties(block.base().toBlockState()));
     }
 }

src/main/java/net/thenextlvl/gopaint/brush/pattern/FracturePattern.java

@@ -30,6 +30,6 @@ public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws W
                 Height.getNearestNonEmptyBlock(block), settings.getFractureStrength()
         ) < 0.1) return false;
 
-        return set.setBlock(extent, getRandomBlockState());
+        return set.setBlock(extent, getRandomBlockState().withProperties(block.base().toBlockState()));
     }
 }

src/main/java/net/thenextlvl/gopaint/brush/pattern/GradientPattern.java

@@ -24,7 +24,7 @@ public record GradientPattern(
     @Override
     public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
         if (settings().getRandom().nextDouble() <= getRate(set)) return false;
-        return set.setBlock(extent, getRandomBlockState(set.y()));
+        return set.setBlock(extent, getRandomBlockState(set.y()).withProperties(get.getBlock(extent)));
     }
 
     public BlockState getRandomBlockState(int altitude) {

src/main/java/net/thenextlvl/gopaint/brush/pattern/OverlayPattern.java

@@ -20,8 +20,9 @@ public record OverlayPattern(
 
     @Override
     public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
-        if (!isOverlay(get, applyBlock(get))) return false;
-        return set.setBlock(extent, getRandomBlockState());
+        var block = applyBlock(get);
+        if (!isOverlay(get, block)) return false;
+        return set.setBlock(extent, getRandomBlockState().withProperties(block.toBlockState()));
     }
 
     private boolean isOverlay(BlockVector3 position, BaseBlock block) {

src/main/java/net/thenextlvl/gopaint/brush/pattern/ShufflePattern.java

@@ -19,6 +19,6 @@ public record ShufflePattern(
 
     @Override
     public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
-        return set.setBlock(extent, getRandomBlockState());
+        return set.setBlock(extent, getRandomBlockState().withProperties(get.getBlock(extent)));
     }
 }

src/main/java/net/thenextlvl/gopaint/brush/pattern/SplatterPattern.java

@@ -20,7 +20,7 @@ public record SplatterPattern(
     @Override
     public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
         if (settings().getRandom().nextDouble() <= getRate(set)) return false;
-        return set.setBlock(extent, getRandomBlockState());
+        return set.setBlock(extent, getRandomBlockState().withProperties(get.getBlock(extent)));
     }
 
     private double getRate(BlockVector3 position) {

src/main/java/net/thenextlvl/gopaint/brush/pattern/SplinePattern.java

@@ -31,7 +31,7 @@ public SplinePattern(EditSession session, BlockVector3 position, Player player,
 
     @Override
     public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
-        return set.setBlock(extent, getRandomBlockState());
+        return set.setBlock(extent, getRandomBlockState().withProperties(get.getBlock(extent)));
     }
 
     @Override

src/main/java/net/thenextlvl/gopaint/brush/pattern/SprayPattern.java

@@ -20,6 +20,6 @@ public record SprayPattern(
     @Override
     public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
         if (settings.getRandom().nextInt(100) >= settings.getChance()) return false;
-        return set.setBlock(extent, getRandomBlockState());
+        return set.setBlock(extent, getRandomBlockState().withProperties(get.getBlock(extent)));
     }
 }

src/main/java/net/thenextlvl/gopaint/brush/pattern/UnderlayPattern.java

@@ -20,8 +20,9 @@ public record UnderlayPattern(
 
     @Override
     public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
-        if (!isUnderlay(get, applyBlock(get))) return false;
-        return set.setBlock(extent, getRandomBlockState());
+        var block = applyBlock(get);
+        if (!isUnderlay(get, block)) return false;
+        return set.setBlock(extent, getRandomBlockState().withProperties(block.toBlockState()));
     }
 
     private boolean isUnderlay(BlockVector3 position, BaseBlock block) {