Merge pull request #64 from KJP12/pr/pistonDestructibles

Allow for custom piston destructible

Author: samolego

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions-snapshots/gradle-7.4-20211124232407+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,10 +1,12 @@
 package org.samo_lego.golfiv.mixin;// Created 2021-08-06T02:20:50
 
+import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.PistonBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
@@ -19,8 +21,13 @@
 public class PistonMixin_PreventDestruction {
     @Redirect(method = "onSyncedBlockEvent", require = 0, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;removeBlock(Lnet/minecraft/util/math/BlockPos;Z)Z"))
     private boolean redirectWorld(World world, BlockPos pos, boolean move) {
-        if(!golfConfig.main.preventDestructionByHeadlessPistons || world.getBlockState(pos).isOf(Blocks.PISTON_HEAD)) {
+        if (!golfConfig.main.preventDestructionByHeadlessPistons || canRemove(world.getBlockState(pos).getBlock())) {
             return world.removeBlock(pos, move);
         } else return false;
     }
+
+    @Unique
+    private boolean canRemove(Block block) {
+        return block == Blocks.PISTON_HEAD || golfConfig.main.allowedDestructibleByHeadlessPistons.contains(block);
+    }
 }