zorb's review 2

Author: MCTian-mi

settings.gradle

@@ -14,6 +14,15 @@ pluginManagement {
         mavenCentral()
         mavenLocal()
     }
+    resolutionStrategy {
+        eachPlugin {
+            // Workaround for updating dependencies w/o touching build.gradle
+            switch (requested.id.id) {
+                case 'com.diffplug.spotless': useVersion '6.25.0'; break
+                case 'com.gtnewhorizons.retrofuturagradle': useVersion '1.4.6'; break
+            }
+        }
+    }
 }
 
 plugins {

src/main/java/gregtech/api/pipenet/block/material/BlockMaterialPipe.java

@@ -25,6 +25,7 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import com.google.common.base.Preconditions;
+import org.jetbrains.annotations.MustBeInvokedByOverriders;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -44,6 +45,10 @@ public BlockMaterialPipe(@NotNull PipeType pipeType, @NotNull MaterialRegistry r
         this.registry = registry;
     }
 
+    public boolean isValidPipeMaterial(Material material) {
+        return !getItemPipeType(getItem(material)).getOrePrefix().isIgnored(material);
+    }
+
     public void addPipeMaterial(Material material, NodeDataType pipeProperties) {
         Preconditions.checkNotNull(material, "material was null");
         Preconditions.checkNotNull(pipeProperties, "the %s of material %s was null", getPipeTypeClass().getSimpleName(),

src/main/java/gregtech/common/CommonProxy.java

@@ -104,21 +104,21 @@ public static void registerBlocks(RegistryEvent.Register<Block> event) {
 
                 if (material.hasProperty(PropertyKey.WIRE)) {
                     for (BlockCable cable : CABLES.get(materialRegistry.getModid())) {
-                        if (!cable.getItemPipeType(null).isCable() ||
-                                !material.getProperty(PropertyKey.WIRE).isSuperconductor())
+                        if (cable.isValidPipeMaterial(material)) {
                             cable.addPipeMaterial(material, material.getProperty(PropertyKey.WIRE));
+                        }
                     }
                 }
                 if (material.hasProperty(PropertyKey.FLUID_PIPE)) {
                     for (BlockFluidPipe pipe : FLUID_PIPES.get(materialRegistry.getModid())) {
-                        if (!pipe.getItemPipeType(pipe.getItem(material)).getOrePrefix().isIgnored(material)) {
+                        if (pipe.isValidPipeMaterial(material)) {
                             pipe.addPipeMaterial(material, material.getProperty(PropertyKey.FLUID_PIPE));
                         }
                     }
                 }
                 if (material.hasProperty(PropertyKey.ITEM_PIPE)) {
                     for (BlockItemPipe pipe : ITEM_PIPES.get(materialRegistry.getModid())) {
-                        if (!pipe.getItemPipeType(pipe.getItem(material)).getOrePrefix().isIgnored(material)) {
+                        if (pipe.isValidPipeMaterial(material)) {
                             pipe.addPipeMaterial(material, material.getProperty(PropertyKey.ITEM_PIPE));
                         }
                     }

src/main/java/gregtech/common/pipelike/cable/BlockCable.java

@@ -7,6 +7,8 @@
 import gregtech.api.pipenet.block.material.BlockMaterialPipe;
 import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.pipenet.tile.TileEntityPipeBase;
+import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.properties.PropertyKey;
 import gregtech.api.unification.material.properties.WireProperties;
 import gregtech.api.unification.material.registry.MaterialRegistry;
 import gregtech.api.util.GTUtility;
@@ -47,6 +49,12 @@ public BlockCable(Insulation cableType, MaterialRegistry registry) {
         setHarvestLevel(ToolClasses.WIRE_CUTTER, 1);
     }
 
+    @Override
+    public boolean isValidPipeMaterial(Material material) {
+        return super.isValidPipeMaterial(material) && !(getItemPipeType(null).isCable() &&
+                material.getProperty(PropertyKey.WIRE).isSuperconductor());
+    }
+
     @Override
     public Class<Insulation> getPipeTypeClass() {
         return Insulation.class;