Fix/drainbrush (#195)

* Fix Drainbrush.
Material no longer has an isFluid implementation, because all usages have access to the block, and the implementation sucked

* Removed unused methods

* Bump patch

---------

Co-authored-by: Lennart99 <23156309+Lennart99@users.noreply.github.com>

Author: KevinDaGame

VoxelSniperCore/src/main/java/com/github/kevindagame/brush/DrainBrush.java

@@ -27,7 +27,7 @@ private void drain(final SnipeData v) {
         for (var pos : positions) {
             var block = pos.getBlock();
             var blockData = block.getBlockData();
-            if (blockData.getMaterial().isFluid()) {
+            if (block.isLiquid()) {
                 addOperation(new BlockOperation(pos, blockData, VoxelMaterial.AIR().createBlockData()));
             } else if (blockData instanceof IWaterlogged waterlogged && waterlogged.isWaterlogged()) {
                 var newData = (IWaterlogged) waterlogged.getCopy();

VoxelSniperCore/src/main/java/com/github/kevindagame/brush/EraserBrush.java

@@ -38,7 +38,7 @@ private void doErase(final SnipeData v) {
         for (var pos : positions) {
             var currentBlock = pos.getBlock();
             if (getExclusiveMaterials().contains(currentBlock.getMaterial())
-                    || (getSnipeAction() == SnipeAction.GUNPOWDER && currentBlock.getMaterial().isFluid())) {
+                    || (getSnipeAction() == SnipeAction.GUNPOWDER && currentBlock.isLiquid())) {
                 continue;
             }
             addOperation(new BlockOperation(pos, currentBlock.getBlockData(), VoxelMaterial.AIR().createBlockData()));

VoxelSniperCore/src/main/java/com/github/kevindagame/brush/StampBrush.java

@@ -6,7 +6,6 @@
 import com.github.kevindagame.util.VoxelMessage;
 import com.github.kevindagame.util.brushOperation.BlockOperation;
 import com.github.kevindagame.voxelsniper.block.IBlock;
-import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
@@ -29,14 +28,6 @@ public final void reSort() {
         this.sorted = false;
     }
 
-    /**
-     * @param material
-     * @return whether this material falls or is a fluid
-     */
-    protected final boolean falling(final VoxelMaterial material) {
-        return material.hasGravity() || material.isFluid();
-    }
-
     /**
      * Sets block at location of cb to the block in cb.
      *

VoxelSniperCore/src/main/java/com/github/kevindagame/voxelsniper/material/IMaterial.java

@@ -4,19 +4,14 @@
 import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
 
 public interface IMaterial extends IKeyed {
-    boolean isSolid();
 
     IBlockData createBlockData();
 
     boolean isAir();
 
-    boolean isFluid();
-
     boolean isTransparent();
 
     boolean isBlock();
 
-    boolean hasGravity();
-
     IBlockData createBlockData(String s);
 }

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/material/BlockMaterial.java

@@ -3,9 +3,7 @@
 import com.github.kevindagame.voxelsniper.blockdata.IBlockData;
 import com.github.kevindagame.voxelsniper.material.VoxelMaterial;
 import com.github.kevindagame.voxelsniperforge.blockdata.ForgeBlockData;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.FallingBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.registries.ForgeRegistries;
 
@@ -38,22 +36,12 @@ public boolean isBlock() {
         return true;
     }
 
-    @Override
-    public boolean isSolid() {
-        return getBlockState().isSolid();
-    }
-
     @Override
     public boolean isTransparent() {
         // TODO is this correct?
         return !getBlockState().isSolid();
     }
 
-    @Override
-    public boolean hasGravity() {
-        return (block instanceof FallingBlock);
-    }
-
     @Override
     public IBlockData createBlockData(String s) {
         return ForgeBlockData.createNewData(this, s);
@@ -69,11 +57,6 @@ public boolean isAir() {
         return block.defaultBlockState().isAir();
     }
 
-    @Override
-    public boolean isFluid() {
-        return ForgeRegistries.FLUIDS.containsKey(new ResourceLocation(getNameSpace(), getKey()));
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == this) return true;

VoxelSniperForge/src/main/java/com/github/kevindagame/voxelsniperforge/material/ItemMaterial.java

@@ -24,16 +24,6 @@ public boolean isBlock() {
         return false;
     }
 
-    @Override
-    public boolean isSolid() {
-        return false;
-    }
-
-    @Override
-    public boolean hasGravity() {
-        return false;
-    }
-
     @Override
     public IBlockData createBlockData(String s) {
         throw new UnsupportedOperationException("Cannot create BlockData from Item");
@@ -49,17 +39,8 @@ public boolean isAir() {
         return false;
     }
 
-    @Override
-    public boolean isFluid() {
-        return false;
-    }
-
     @Override
     public int hashCode() {
         return Objects.hash(item);
     }
-
-    public Item getItem() {
-        return item;
-    }
 }

VoxelSniperSpigot/build.gradle.kts

@@ -67,6 +67,6 @@ tasks.register<xyz.jpenilla.runpaper.task.RunServerTask>("run19") {
 tasks.register<xyz.jpenilla.runpaper.task.RunServerTask>("run20") {
     dependsOn(tasks.shadowJar)
     pluginJars(File("../output/voxelsniper-${version}-${platform}.jar"))
-    minecraftVersion("1.20")
+    minecraftVersion("1.20.1")
     group = "run paper"
 }

VoxelSniperSpigot/src/main/java/com/github/kevindagame/voxelsniper/material/SpigotMaterial.java

@@ -18,11 +18,6 @@ public static VoxelMaterial fromSpigotMaterial(Material type) {
         return VoxelMaterial.getMaterial(type.getKey().getNamespace(), type.getKey().getKey());
     }
 
-    @Override
-    public boolean isSolid() {
-        return material.isSolid();
-    }
-
     @NotNull
     @Override
     public String getKey() {
@@ -39,11 +34,6 @@ public boolean isAir() {
         return material.isAir();
     }
 
-    @Override
-    public boolean isFluid() {
-        return getKey().equals("water") || getKey().equals("lava");
-    }
-
     @Override
     public boolean isTransparent() {
         return material.isTransparent();
@@ -53,12 +43,6 @@ public boolean isTransparent() {
     public boolean isBlock() {
         return material.isBlock();
     }
-
-    @Override
-    public boolean hasGravity() {
-        return material.hasGravity();
-    }
-
     @Override
     public IBlockData createBlockData(String s) {
         return SpigotBlockData.fromSpigotData(material.createBlockData(s));