1.20.1-1.12.7 release with breaker target fix and hopper hardness

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.daemon=false
 
 mod_id=cyclic
 curse_id=239286
-mod_version=1.12.6
+mod_version=1.12.7
 
 # NEO FORGED
 forge_version=47.1.65

src/main/java/com/lothrazar/cyclic/block/breaker/TileBreaker.java

@@ -12,6 +12,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 
 public class TileBreaker extends TileBlockEntityCyclic implements MenuProvider {
 
@@ -44,14 +45,32 @@ public void tick() {
       return;
     }
     BlockPos target = worldPosition.relative(this.getCurrentFacing());
-    BlockState state = level.getBlockState(target);
-    if (!state.isAir() &&
-        state.getDestroySpeed(level, target) >= 0) {
+    if (this.isValid(target)) {
+       //old way would pass thru here and try to mine minecraft:water 
       this.level.destroyBlock(target, true);
     }
     //else unbreakable
   }
 
+  /**
+   * Avoid mining source liquid blocks and unbreakable
+   */
+  private boolean isValid(BlockPos target) {
+    BlockState state = level.getBlockState(target);
+    if (level.isEmptyBlock(target)
+        && state.getDestroySpeed(level, target) >= 0) {
+      return false;
+    }
+    if (state.getFluidState() != null && state.getFluidState().isEmpty() == false) {
+      //am i a solid waterlogged state block? 
+      if (state.hasProperty(BlockStateProperties.WATERLOGGED) == false) {
+        //pure liquid. but this will make canHarvestBlock go true  
+        return false;
+      }
+    }
+    return true;
+  }
+
   @Override
   public Component getDisplayName() {
     return BlockRegistry.BREAKER.get().getName();

src/main/java/com/lothrazar/cyclic/block/hopper/BlockSimpleHopper.java

@@ -27,7 +27,7 @@ public class BlockSimpleHopper extends BlockCyclic {
   public static final DirectionProperty FACING = BlockStateProperties.FACING_HOPPER;
 
   public BlockSimpleHopper(Properties properties) {
-    super(properties.strength(1.3F));
+    super(properties.strength(2.0F, 3.0F));
   }
 
   @Override

src/main/java/com/lothrazar/cyclic/block/hoppergold/BlockGoldHopper.java

@@ -12,7 +12,7 @@
 public class BlockGoldHopper extends BlockSimpleHopper {
 
   public BlockGoldHopper(Properties properties) {
-    super(properties.strength(1.3F));
+    super(properties);
   }
 
   @Override

src/main/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "cyclic:hopper"
+  ]
+}

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -2,6 +2,8 @@
   "replace": false,
   "values": [
     "cyclic:compressed_cobblestone",
-    "cyclic:flint_block"
+    "cyclic:flint_block",
+    "cyclic:hopper_gold",
+    "cyclic:hopper"
   ]
 }

src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json

@@ -2,6 +2,7 @@
   "replace": false,
   "values": [
     "cyclic:soil",
+    "cyclic:terra_preta",
     "cyclic:peat_baked",
     "cyclic:peat_unbaked"
   ]

update.json

@@ -161,5 +161,6 @@
 		,"1.20.4": "Remove eating cooldown on some foods.  Glistering Chorus Fruit is now stackable again like before (potion time +stacks up #2309).  CraftTweaker zenscript support added to the 5 cyclic recipe types, see scripts folder in this link for examples https://github.com/Lothrazar/Cyclic/tree/trunk/1.20/examples "
 		,"1.20.5":"Merge pull request #2334 from TelepathicGrunt/trunk/1.20 Optimize anti beacon to not deadlock worldgen or lag entities"
 		,"1.20.6":"#2332 Patch doorbell crash.  Patch InvocationTargetException: null errors coming from IHasClickToggle"
+		,"1.20.7":"Change curio render_toggle. #2356. Wooden Hopper is mineable with axes.  Fixed Block Breaker attempting to break liquid source blocks.  "
 	}
 }