Skip to content

Extract enabledMaterials map to BlockMaterialPipe class #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2025
Merged

Extract enabledMaterials map to BlockMaterialPipe class #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions src/main/java/gregtech/api/pipenet/block/material/BlockMaterialPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,52 @@

import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

import com.google.common.base.Preconditions;
import org.jetbrains.annotations.NotNull;

import java.util.Objects;
import java.util.*;

public abstract class BlockMaterialPipe<
PipeType extends Enum<PipeType> & IPipeType<NodeDataType> & IMaterialPipeType<NodeDataType>, NodeDataType,
WorldPipeNetType extends WorldPipeNet<NodeDataType, ? extends PipeNet<NodeDataType>>>
extends BlockPipe<PipeType, NodeDataType, WorldPipeNetType> {

protected final PipeType pipeType;
protected final Map<Material, NodeDataType> enabledMaterials;
private final MaterialRegistry registry;

public BlockMaterialPipe(@NotNull PipeType pipeType, @NotNull MaterialRegistry registry) {
this.pipeType = pipeType;
this.enabledMaterials = new TreeMap<>();
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(),
material);
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
"material %s is not registered", material);
this.enabledMaterials.put(material, pipeProperties);
}

public Collection<Material> getEnabledMaterials() {
return Collections.unmodifiableSet(enabledMaterials.keySet());
}

@Override
public NodeDataType createProperties(IPipeTile<PipeType, NodeDataType> pipeTile) {
PipeType pipeType = pipeTile.getPipeType();
Expand Down Expand Up @@ -80,7 +102,21 @@ public ItemStack getDropItem(IPipeTile<PipeType, NodeDataType> pipeTile) {
return getItem(material);
}

protected abstract NodeDataType createProperties(PipeType pipeType, Material material);
protected NodeDataType createProperties(PipeType pipeType, Material material) {
return pipeType.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
}

@Override
protected NodeDataType getFallbackType() {
return enabledMaterials.values().iterator().next();
}

@Override
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
for (Material material : enabledMaterials.keySet()) {
items.add(getItem(material));
}
}

public OrePrefix getPrefix() {
return pipeType.getOrePrefix();
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/gregtech/common/CommonProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
cable.addCableMaterial(material, material.getProperty(PropertyKey.WIRE));
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));
}
}
Expand Down
44 changes: 5 additions & 39 deletions src/main/java/gregtech/common/pipelike/cable/BlockCable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
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;
Expand All @@ -22,7 +23,6 @@
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
Expand All @@ -31,81 +31,47 @@
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

import com.google.common.base.Preconditions;
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;

import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;

public class BlockCable extends BlockMaterialPipe<Insulation, WireProperties, WorldENet>
implements ITileEntityProvider {

private final Map<Material, WireProperties> enabledMaterials = new TreeMap<>();

public BlockCable(Insulation cableType, MaterialRegistry registry) {
super(cableType, registry);
setCreativeTab(GTCreativeTabs.TAB_GREGTECH_CABLES);
setHarvestLevel(ToolClasses.WIRE_CUTTER, 1);
}

public void addCableMaterial(Material material, WireProperties wireProperties) {
Preconditions.checkNotNull(material, "material was null");
Preconditions.checkNotNull(wireProperties, "material %s wireProperties was null", material);
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
"material %s is not registered", material);
if (!pipeType.orePrefix.isIgnored(material)) {
this.enabledMaterials.put(material, wireProperties);
}
}

public Collection<Material> getEnabledMaterials() {
return Collections.unmodifiableSet(enabledMaterials.keySet());
@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;
}

@Override
protected WireProperties createProperties(Insulation insulation, Material material) {
return insulation.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
}

@SideOnly(Side.CLIENT)
@NotNull
@Override
public PipeRenderer getPipeRenderer() {
return CableRenderer.INSTANCE;
}

@Override
protected WireProperties getFallbackType() {
return enabledMaterials.values().iterator().next();
}

@Override
public WorldENet getWorldPipeNet(World world) {
return WorldENet.getWorldENet(world);
}

@Override
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
for (Material material : enabledMaterials.keySet()) {
items.add(getItem(material));
}
}

@Override
protected boolean isPipeTool(@NotNull ItemStack stack) {
return ToolHelper.isTool(stack, ToolClasses.WIRE_CUTTER);
Expand Down
40 changes: 0 additions & 40 deletions src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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.FluidPipeProperties;
import gregtech.api.unification.material.registry.MaterialRegistry;
import gregtech.api.util.EntityDamageUtil;
Expand All @@ -17,53 +16,31 @@

import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

import com.google.common.base.Preconditions;
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;

import java.util.Collection;
import java.util.Collections;
import java.util.SortedMap;
import java.util.TreeMap;

public class BlockFluidPipe extends BlockMaterialPipe<FluidPipeType, FluidPipeProperties, WorldFluidPipeNet> {

private final SortedMap<Material, FluidPipeProperties> enabledMaterials = new TreeMap<>();

public BlockFluidPipe(FluidPipeType pipeType, MaterialRegistry registry) {
super(pipeType, registry);
setCreativeTab(GTCreativeTabs.TAB_GREGTECH_PIPES);
setHarvestLevel(ToolClasses.WRENCH, 1);
}

public void addPipeMaterial(Material material, FluidPipeProperties fluidPipeProperties) {
Preconditions.checkNotNull(material, "material");
Preconditions.checkNotNull(fluidPipeProperties, "material %s fluidPipeProperties was null", material);
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
"material %s is not registered", material);
this.enabledMaterials.put(material, fluidPipeProperties);
}

public Collection<Material> getEnabledMaterials() {
return Collections.unmodifiableSet(enabledMaterials.keySet());
}

@Override
public Class<FluidPipeType> getPipeTypeClass() {
return FluidPipeType.class;
Expand All @@ -74,30 +51,13 @@ public WorldFluidPipeNet getWorldPipeNet(World world) {
return WorldFluidPipeNet.getWorldPipeNet(world);
}

@Override
protected FluidPipeProperties createProperties(FluidPipeType fluidPipeType, Material material) {
return fluidPipeType.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
}

@SideOnly(Side.CLIENT)
@NotNull
@Override
public PipeRenderer getPipeRenderer() {
return FluidPipeRenderer.INSTANCE;
}

@Override
protected FluidPipeProperties getFallbackType() {
return enabledMaterials.values().iterator().next();
}

@Override
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
for (Material material : enabledMaterials.keySet()) {
items.add(getItem(material));
}
}

@Override
public void breakBlock(@NotNull World worldIn, @NotNull BlockPos pos, @NotNull IBlockState state) {
super.breakBlock(worldIn, pos, state);
Expand Down
40 changes: 0 additions & 40 deletions src/main/java/gregtech/common/pipelike/itempipe/BlockItemPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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.ItemPipeProperties;
import gregtech.api.unification.material.registry.MaterialRegistry;
import gregtech.client.renderer.pipe.ItemPipeRenderer;
Expand All @@ -16,46 +15,28 @@

import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.CapabilityItemHandler;

import com.google.common.base.Preconditions;
import org.apache.commons.lang3.tuple.Pair;
import org.jetbrains.annotations.NotNull;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

public class BlockItemPipe extends BlockMaterialPipe<ItemPipeType, ItemPipeProperties, WorldItemPipeNet> {

private final Map<Material, ItemPipeProperties> enabledMaterials = new HashMap<>();

public BlockItemPipe(ItemPipeType itemPipeType, MaterialRegistry registry) {
super(itemPipeType, registry);
setCreativeTab(GTCreativeTabs.TAB_GREGTECH_PIPES);
setHarvestLevel(ToolClasses.WRENCH, 1);
}

public void addPipeMaterial(Material material, ItemPipeProperties properties) {
Preconditions.checkNotNull(material, "material");
Preconditions.checkNotNull(properties, "material %s itemPipeProperties was null", material);
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
"material %s is not registered", material);
this.enabledMaterials.put(material, properties);
}

@Override
public TileEntityPipeBase<ItemPipeType, ItemPipeProperties> createNewTileEntity(boolean supportsTicking) {
return supportsTicking ? new TileEntityItemPipeTickable() : new TileEntityItemPipe();
Expand All @@ -66,11 +47,6 @@ public Class<ItemPipeType> getPipeTypeClass() {
return ItemPipeType.class;
}

@Override
protected ItemPipeProperties getFallbackType() {
return enabledMaterials.values().iterator().next();
}

@Override
public WorldItemPipeNet getWorldPipeNet(World world) {
return WorldItemPipeNet.getWorldPipeNet(world);
Expand All @@ -82,29 +58,13 @@ protected Pair<TextureAtlasSprite, Integer> getParticleTexture(World world, Bloc
return ItemPipeRenderer.INSTANCE.getParticleTexture((TileEntityItemPipe) world.getTileEntity(blockPos));
}

@Override
protected ItemPipeProperties createProperties(ItemPipeType itemPipeType, Material material) {
return itemPipeType.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
}

@SideOnly(Side.CLIENT)
@NotNull
@Override
public PipeRenderer getPipeRenderer() {
return ItemPipeRenderer.INSTANCE;
}

public Collection<Material> getEnabledMaterials() {
return Collections.unmodifiableSet(enabledMaterials.keySet());
}

@Override
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
for (Material material : enabledMaterials.keySet()) {
items.add(getItem(material));
}
}

@Override
public boolean canPipesConnect(IPipeTile<ItemPipeType, ItemPipeProperties> selfTile, EnumFacing side,
IPipeTile<ItemPipeType, ItemPipeProperties> sideTile) {
Expand Down
Loading