improvements to branch connectables

Author: supermassimo

src/main/java/com/ferreusveritas/dynamictrees/block/NullTreePart.java

@@ -1,5 +1,6 @@
 package com.ferreusveritas.dynamictrees.block;
 
+import com.ferreusveritas.dynamictrees.api.TreeHelper;
 import com.ferreusveritas.dynamictrees.api.cell.Cell;
 import com.ferreusveritas.dynamictrees.api.cell.CellNull;
 import com.ferreusveritas.dynamictrees.api.network.MapSignal;
@@ -35,7 +36,7 @@ public GrowSignal growSignal(Level level, BlockPos pos, GrowSignal signal) {
     public int getRadiusForConnection(BlockState state, BlockGetter level, BlockPos pos, BranchBlock from, Direction side, int fromRadius) {
         // Connectable blocks such as bee nests and shroomlight will be handled here.
         if (BranchConnectables.isBlockConnectable(state.getBlock())) {
-            int rad = BranchConnectables.getConnectionRadiusForBlock(state, level, pos, side);
+            int rad = BranchConnectables.getConnectionRadiusForBlock(state, level, pos, side, from.getFamily());
             if (rad > 0) {
                 return rad;
             }

src/main/java/com/ferreusveritas/dynamictrees/systems/BranchConnectables.java

@@ -1,5 +1,6 @@
 package com.ferreusveritas.dynamictrees.systems;
 
+import com.ferreusveritas.dynamictrees.tree.family.Family;
 import com.ferreusveritas.dynamictrees.util.function.TetraFunction;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -18,20 +19,48 @@
  */
 public class BranchConnectables {
 
-    private static final Map<Block, TetraFunction<BlockState, BlockGetter, BlockPos, Direction, Integer>> connectablesMap = new HashMap<>();
+    private static final Map<Block, Map<Family, TetraFunction<BlockState, BlockGetter, BlockPos, Direction, Integer>>> connectablesMap = new HashMap<>();
 
     //Direction can be null
+    public static void makeBlockConnectable(Block block, TetraFunction<BlockState, BlockGetter, BlockPos, Direction, Integer> radiusFunction, Family family) {
+        var map = connectablesMap.computeIfAbsent(block, k -> new HashMap<>());
+        map.putIfAbsent(family, radiusFunction);
+    }
     public static void makeBlockConnectable(Block block, TetraFunction<BlockState, BlockGetter, BlockPos, Direction, Integer> radiusFunction) {
-        connectablesMap.putIfAbsent(block, radiusFunction);
+        makeBlockConnectable(block, radiusFunction, Family.NULL_FAMILY);
+    }
+    public static void replaceBlockConnectable(Block block, TetraFunction<BlockState, BlockGetter, BlockPos, Direction, Integer> radiusFunction, Family family) {
+        var map = connectablesMap.computeIfAbsent(block, k -> new HashMap<>());
+        map.remove(family);
+        map.put(family, radiusFunction);
     }
 
     public static boolean isBlockConnectable(Block block) {
         return connectablesMap.containsKey(block);
     }
 
-    public static int getConnectionRadiusForBlock(BlockState state, BlockGetter world, BlockPos pos, @Nullable Direction side) {
+    public static int getConnectionRadiusForBlock(BlockState state, BlockGetter world, BlockPos pos, @Nullable Direction side, Family family) {
         final Block block = state.getBlock();
-        return isBlockConnectable(block) ? connectablesMap.get(block).apply(state, world, pos, side) : 0;
+        if (isBlockConnectable(block)){
+            var function = getFunctionForFamily(block, family);
+            if (function == null) return 0;
+            return function.apply(state, world, pos, side);
+        } else {
+            return 0;
+        }
+    }
+    public static int getConnectionRadiusForBlock(BlockState state, BlockGetter world, BlockPos pos, @Nullable Direction side) {
+        return getConnectionRadiusForBlock(state, world, pos, side, Family.NULL_FAMILY);
     }
 
+    @Nullable
+    private static TetraFunction<BlockState, BlockGetter, BlockPos, Direction, Integer> getFunctionForFamily(Block block, Family family){
+        var familyMap = connectablesMap.get(block);
+        if (familyMap == null) return null;
+        var function = familyMap.get(family);
+        if (function == null){
+            function = familyMap.get(Family.NULL_FAMILY);
+        }
+        return function;
+    }
 }

src/main/java/com/ferreusveritas/dynamictrees/systems/nodemapper/DestroyerNode.java

@@ -38,7 +38,7 @@ public DestroyerNode setPlayer(Player player) {
     }
     @Override
     public boolean run(BlockState state, LevelAccessor level, BlockPos pos, @Nullable Direction fromDir) {
-        if (BranchConnectables.getConnectionRadiusForBlock(state, level, pos, fromDir == null ? null : fromDir.getOpposite()) > 0) {
+        if (BranchConnectables.getConnectionRadiusForBlock(state, level, pos, fromDir == null ? null : fromDir.getOpposite(), species.getFamily()) > 0) {
             if (player != null && level instanceof Level) {
                 BlockEntity te = level.getBlockEntity(pos);
                 state.getBlock().onDestroyedByPlayer(state, (Level) level, pos, player, false, level.getFluidState(pos));