Skip to content

Commit 82ffb80

Browse files
committed
Yeet some things and clarify others
1 parent 7d0e48c commit 82ffb80

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/java/gregtech/api/pipenet/block/BlockPipe.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ public ItemStack getItem(@NotNull World world, @NotNull BlockPos pos, @NotNull I
175175

176176
protected abstract NodeDataType getFallbackType();
177177

178-
// TODO this has no reason to need an ItemStack parameter
179178
public abstract PipeType getPipeType();
180179

181180
public abstract void setTileEntityData(TileEntityPipeBase<PipeType, NodeDataType> pipeTile, ItemStack itemStack);

src/main/java/gregtech/client/renderer/pipe/cover/CoverRendererBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class CoverRendererBuilder {
3737
private static final ColorQuadCache[] PLATE_QUADS;
3838
private static final EnumMap<EnumFacing, SubListAddress> PLATE_COORDS = new EnumMap<>(EnumFacing.class);
3939

40-
private static final UVMapper defaultMapper = UVMapper.standard(0);
40+
private static final UVMapper DEFAULT_MAPPER = UVMapper.standard(0);
4141

4242
static {
4343
PLATE_QUADS = new ColorQuadCache[Textures.VOLTAGE_CASINGS.length];
@@ -64,7 +64,7 @@ protected static SubListAddress buildPlates(List<RecolorableBakedQuad> quads, En
6464
int start = quads.size();
6565
Pair<Vector3f, Vector3f> box = CoverRendererValues.PLATE_BOXES.get(facing);
6666
for (EnumFacing dir : EnumFacing.values()) {
67-
quads.add(QuadHelper.buildQuad(dir, box, CoverRendererBuilder.defaultMapper, sprite));
67+
quads.add(QuadHelper.buildQuad(dir, box, CoverRendererBuilder.DEFAULT_MAPPER, sprite));
6868
}
6969
return new SubListAddress(start, quads.size());
7070
}
@@ -78,8 +78,8 @@ protected static void addPlates(List<BakedQuad> quads, List<BakedQuad> plateQuad
7878
protected final TextureAtlasSprite sprite;
7979
protected final TextureAtlasSprite spriteEmissive;
8080

81-
protected UVMapper mapper = defaultMapper;
82-
protected UVMapper mapperEmissive = defaultMapper;
81+
protected UVMapper mapper = DEFAULT_MAPPER;
82+
protected UVMapper mapperEmissive = DEFAULT_MAPPER;
8383

8484
protected ColorQuadCache plateQuads = PLATE_QUADS[1];
8585

src/main/java/gregtech/client/renderer/pipe/util/ActivableCacheKey.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ public boolean isActive() {
2525
return active;
2626
}
2727

28-
// activeness is merely a way to pass information onwards, it does not result in separate mappings.
28+
// activeness is merely a way to pass information onwards, it does not require a separate cache to be built.
29+
// thus we do not override equals() and hashCode() to account for the active field.
2930
}

0 commit comments

Comments
 (0)