Skip to content

Commit cfb6e04

Browse files
MCTian-miMCTian-mi
committed
zorb's review
1 parent 9603105 commit cfb6e04

File tree

5 files changed

+28
-91
lines changed

5 files changed

+28
-91
lines changed

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515

1616
import net.minecraft.block.state.IBlockState;
1717
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
18+
import net.minecraft.creativetab.CreativeTabs;
1819
import net.minecraft.item.Item;
1920
import net.minecraft.item.ItemStack;
21+
import net.minecraft.util.NonNullList;
2022
import net.minecraft.util.ResourceLocation;
2123
import net.minecraftforge.client.model.ModelLoader;
2224
import net.minecraftforge.fml.relauncher.Side;
2325
import net.minecraftforge.fml.relauncher.SideOnly;
2426

27+
import com.google.common.base.Preconditions;
2528
import org.jetbrains.annotations.NotNull;
2629

2730
import java.util.*;
@@ -41,6 +44,15 @@ public BlockMaterialPipe(@NotNull PipeType pipeType, @NotNull MaterialRegistry r
4144
this.registry = registry;
4245
}
4346

47+
public void addPipeMaterial(Material material, NodeDataType pipeProperties) {
48+
Preconditions.checkNotNull(material, "material was null");
49+
Preconditions.checkNotNull(pipeProperties, "the %s of material %s was null", getPipeTypeClass().getSimpleName(),
50+
material);
51+
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
52+
"material %s is not registered", material);
53+
this.enabledMaterials.put(material, pipeProperties);
54+
}
55+
4456
public Collection<Material> getEnabledMaterials() {
4557
return Collections.unmodifiableSet(enabledMaterials.keySet());
4658
}
@@ -86,7 +98,21 @@ public ItemStack getDropItem(IPipeTile<PipeType, NodeDataType> pipeTile) {
8698
return getItem(material);
8799
}
88100

89-
protected abstract NodeDataType createProperties(PipeType pipeType, Material material);
101+
protected NodeDataType createProperties(PipeType pipeType, Material material) {
102+
return pipeType.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
103+
}
104+
105+
@Override
106+
protected NodeDataType getFallbackType() {
107+
return enabledMaterials.values().iterator().next();
108+
}
109+
110+
@Override
111+
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
112+
for (Material material : enabledMaterials.keySet()) {
113+
items.add(getItem(material));
114+
}
115+
}
90116

91117
public OrePrefix getPrefix() {
92118
return pipeType.getOrePrefix();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static void registerBlocks(RegistryEvent.Register<Block> event) {
106106
for (BlockCable cable : CABLES.get(materialRegistry.getModid())) {
107107
if (!cable.getItemPipeType(null).isCable() ||
108108
!material.getProperty(PropertyKey.WIRE).isSuperconductor())
109-
cable.addCableMaterial(material, material.getProperty(PropertyKey.WIRE));
109+
cable.addPipeMaterial(material, material.getProperty(PropertyKey.WIRE));
110110
}
111111
}
112112
if (material.hasProperty(PropertyKey.FLUID_PIPE)) {

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import gregtech.api.pipenet.block.material.BlockMaterialPipe;
88
import gregtech.api.pipenet.tile.IPipeTile;
99
import gregtech.api.pipenet.tile.TileEntityPipeBase;
10-
import gregtech.api.unification.material.Material;
1110
import gregtech.api.unification.material.properties.WireProperties;
1211
import gregtech.api.unification.material.registry.MaterialRegistry;
1312
import gregtech.api.util.GTUtility;
@@ -22,7 +21,6 @@
2221
import net.minecraft.block.ITileEntityProvider;
2322
import net.minecraft.block.state.IBlockState;
2423
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
25-
import net.minecraft.creativetab.CreativeTabs;
2624
import net.minecraft.entity.Entity;
2725
import net.minecraft.entity.EntityLivingBase;
2826
import net.minecraft.entity.player.EntityPlayer;
@@ -31,14 +29,12 @@
3129
import net.minecraft.tileentity.TileEntity;
3230
import net.minecraft.util.EnumBlockRenderType;
3331
import net.minecraft.util.EnumFacing;
34-
import net.minecraft.util.NonNullList;
3532
import net.minecraft.util.math.BlockPos;
3633
import net.minecraft.world.IBlockAccess;
3734
import net.minecraft.world.World;
3835
import net.minecraftforge.fml.relauncher.Side;
3936
import net.minecraftforge.fml.relauncher.SideOnly;
4037

41-
import com.google.common.base.Preconditions;
4238
import org.apache.commons.lang3.tuple.Pair;
4339
import org.jetbrains.annotations.NotNull;
4440

@@ -51,50 +47,23 @@ public BlockCable(Insulation cableType, MaterialRegistry registry) {
5147
setHarvestLevel(ToolClasses.WIRE_CUTTER, 1);
5248
}
5349

54-
public void addCableMaterial(Material material, WireProperties wireProperties) {
55-
Preconditions.checkNotNull(material, "material was null");
56-
Preconditions.checkNotNull(wireProperties, "material %s wireProperties was null", material);
57-
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
58-
"material %s is not registered", material);
59-
if (!pipeType.orePrefix.isIgnored(material)) {
60-
this.enabledMaterials.put(material, wireProperties);
61-
}
62-
}
63-
6450
@Override
6551
public Class<Insulation> getPipeTypeClass() {
6652
return Insulation.class;
6753
}
6854

69-
@Override
70-
protected WireProperties createProperties(Insulation insulation, Material material) {
71-
return insulation.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
72-
}
73-
7455
@SideOnly(Side.CLIENT)
7556
@NotNull
7657
@Override
7758
public PipeRenderer getPipeRenderer() {
7859
return CableRenderer.INSTANCE;
7960
}
8061

81-
@Override
82-
protected WireProperties getFallbackType() {
83-
return enabledMaterials.values().iterator().next();
84-
}
85-
8662
@Override
8763
public WorldENet getWorldPipeNet(World world) {
8864
return WorldENet.getWorldENet(world);
8965
}
9066

91-
@Override
92-
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
93-
for (Material material : enabledMaterials.keySet()) {
94-
items.add(getItem(material));
95-
}
96-
}
97-
9867
@Override
9968
protected boolean isPipeTool(@NotNull ItemStack stack) {
10069
return ToolHelper.isTool(stack, ToolClasses.WIRE_CUTTER);

‎src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import gregtech.api.pipenet.block.material.BlockMaterialPipe;
55
import gregtech.api.pipenet.tile.IPipeTile;
66
import gregtech.api.pipenet.tile.TileEntityPipeBase;
7-
import gregtech.api.unification.material.Material;
87
import gregtech.api.unification.material.properties.FluidPipeProperties;
98
import gregtech.api.unification.material.registry.MaterialRegistry;
109
import gregtech.api.util.EntityDamageUtil;
@@ -17,23 +16,20 @@
1716

1817
import net.minecraft.block.state.IBlockState;
1918
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
20-
import net.minecraft.creativetab.CreativeTabs;
2119
import net.minecraft.entity.Entity;
2220
import net.minecraft.entity.EntityLivingBase;
2321
import net.minecraft.entity.player.EntityPlayer;
2422
import net.minecraft.item.ItemStack;
2523
import net.minecraft.tileentity.TileEntity;
2624
import net.minecraft.util.EnumBlockRenderType;
2725
import net.minecraft.util.EnumFacing;
28-
import net.minecraft.util.NonNullList;
2926
import net.minecraft.util.math.BlockPos;
3027
import net.minecraft.world.World;
3128
import net.minecraftforge.fluids.FluidTank;
3229
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
3330
import net.minecraftforge.fml.relauncher.Side;
3431
import net.minecraftforge.fml.relauncher.SideOnly;
3532

36-
import com.google.common.base.Preconditions;
3733
import org.apache.commons.lang3.tuple.Pair;
3834
import org.jetbrains.annotations.NotNull;
3935

@@ -45,14 +41,6 @@ public BlockFluidPipe(FluidPipeType pipeType, MaterialRegistry registry) {
4541
setHarvestLevel(ToolClasses.WRENCH, 1);
4642
}
4743

48-
public void addPipeMaterial(Material material, FluidPipeProperties fluidPipeProperties) {
49-
Preconditions.checkNotNull(material, "material");
50-
Preconditions.checkNotNull(fluidPipeProperties, "material %s fluidPipeProperties was null", material);
51-
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
52-
"material %s is not registered", material);
53-
this.enabledMaterials.put(material, fluidPipeProperties);
54-
}
55-
5644
@Override
5745
public Class<FluidPipeType> getPipeTypeClass() {
5846
return FluidPipeType.class;
@@ -63,30 +51,13 @@ public WorldFluidPipeNet getWorldPipeNet(World world) {
6351
return WorldFluidPipeNet.getWorldPipeNet(world);
6452
}
6553

66-
@Override
67-
protected FluidPipeProperties createProperties(FluidPipeType fluidPipeType, Material material) {
68-
return fluidPipeType.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
69-
}
70-
7154
@SideOnly(Side.CLIENT)
7255
@NotNull
7356
@Override
7457
public PipeRenderer getPipeRenderer() {
7558
return FluidPipeRenderer.INSTANCE;
7659
}
7760

78-
@Override
79-
protected FluidPipeProperties getFallbackType() {
80-
return enabledMaterials.values().iterator().next();
81-
}
82-
83-
@Override
84-
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
85-
for (Material material : enabledMaterials.keySet()) {
86-
items.add(getItem(material));
87-
}
88-
}
89-
9061
@Override
9162
public void breakBlock(@NotNull World worldIn, @NotNull BlockPos pos, @NotNull IBlockState state) {
9263
super.breakBlock(worldIn, pos, state);

‎src/main/java/gregtech/common/pipelike/itempipe/BlockItemPipe.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import gregtech.api.pipenet.block.material.BlockMaterialPipe;
55
import gregtech.api.pipenet.tile.IPipeTile;
66
import gregtech.api.pipenet.tile.TileEntityPipeBase;
7-
import gregtech.api.unification.material.Material;
87
import gregtech.api.unification.material.properties.ItemPipeProperties;
98
import gregtech.api.unification.material.registry.MaterialRegistry;
109
import gregtech.client.renderer.pipe.ItemPipeRenderer;
@@ -16,20 +15,17 @@
1615

1716
import net.minecraft.block.state.IBlockState;
1817
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
19-
import net.minecraft.creativetab.CreativeTabs;
2018
import net.minecraft.entity.player.EntityPlayer;
2119
import net.minecraft.item.ItemStack;
2220
import net.minecraft.tileentity.TileEntity;
2321
import net.minecraft.util.EnumBlockRenderType;
2422
import net.minecraft.util.EnumFacing;
25-
import net.minecraft.util.NonNullList;
2623
import net.minecraft.util.math.BlockPos;
2724
import net.minecraft.world.World;
2825
import net.minecraftforge.fml.relauncher.Side;
2926
import net.minecraftforge.fml.relauncher.SideOnly;
3027
import net.minecraftforge.items.CapabilityItemHandler;
3128

32-
import com.google.common.base.Preconditions;
3329
import org.apache.commons.lang3.tuple.Pair;
3430
import org.jetbrains.annotations.NotNull;
3531

@@ -41,14 +37,6 @@ public BlockItemPipe(ItemPipeType itemPipeType, MaterialRegistry registry) {
4137
setHarvestLevel(ToolClasses.WRENCH, 1);
4238
}
4339

44-
public void addPipeMaterial(Material material, ItemPipeProperties properties) {
45-
Preconditions.checkNotNull(material, "material");
46-
Preconditions.checkNotNull(properties, "material %s itemPipeProperties was null", material);
47-
Preconditions.checkArgument(material.getRegistry().getNameForObject(material) != null,
48-
"material %s is not registered", material);
49-
this.enabledMaterials.put(material, properties);
50-
}
51-
5240
@Override
5341
public TileEntityPipeBase<ItemPipeType, ItemPipeProperties> createNewTileEntity(boolean supportsTicking) {
5442
return supportsTicking ? new TileEntityItemPipeTickable() : new TileEntityItemPipe();
@@ -59,11 +47,6 @@ public Class<ItemPipeType> getPipeTypeClass() {
5947
return ItemPipeType.class;
6048
}
6149

62-
@Override
63-
protected ItemPipeProperties getFallbackType() {
64-
return enabledMaterials.values().iterator().next();
65-
}
66-
6750
@Override
6851
public WorldItemPipeNet getWorldPipeNet(World world) {
6952
return WorldItemPipeNet.getWorldPipeNet(world);
@@ -75,25 +58,13 @@ protected Pair<TextureAtlasSprite, Integer> getParticleTexture(World world, Bloc
7558
return ItemPipeRenderer.INSTANCE.getParticleTexture((TileEntityItemPipe) world.getTileEntity(blockPos));
7659
}
7760

78-
@Override
79-
protected ItemPipeProperties createProperties(ItemPipeType itemPipeType, Material material) {
80-
return itemPipeType.modifyProperties(enabledMaterials.getOrDefault(material, getFallbackType()));
81-
}
82-
8361
@SideOnly(Side.CLIENT)
8462
@NotNull
8563
@Override
8664
public PipeRenderer getPipeRenderer() {
8765
return ItemPipeRenderer.INSTANCE;
8866
}
8967

90-
@Override
91-
public void getSubBlocks(@NotNull CreativeTabs itemIn, @NotNull NonNullList<ItemStack> items) {
92-
for (Material material : enabledMaterials.keySet()) {
93-
items.add(getItem(material));
94-
}
95-
}
96-
9768
@Override
9869
public boolean canPipesConnect(IPipeTile<ItemPipeType, ItemPipeProperties> selfTile, EnumFacing side,
9970
IPipeTile<ItemPipeType, ItemPipeProperties> sideTile) {

0 commit comments

Comments
 (0)