From 6cb3e6e57e66fa99e4d599935cc07e7aa5dcc249 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 8 Jul 2023 10:38:52 +0200 Subject: [PATCH] resolved some TODOs --- .../java/de/ellpeck/prettypipes/misc/ItemEquality.java | 1 - .../de/ellpeck/prettypipes/misc/ItemTerminalWidget.java | 2 -- src/main/java/de/ellpeck/prettypipes/pipe/PipeBlock.java | 7 ++++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/ellpeck/prettypipes/misc/ItemEquality.java b/src/main/java/de/ellpeck/prettypipes/misc/ItemEquality.java index 3a801d6..5591daa 100644 --- a/src/main/java/de/ellpeck/prettypipes/misc/ItemEquality.java +++ b/src/main/java/de/ellpeck/prettypipes/misc/ItemEquality.java @@ -10,7 +10,6 @@ import java.util.function.Supplier; public class ItemEquality { public static final ItemEquality DAMAGE = new ItemEquality((stack, filter) -> stack.getDamageValue() == filter.getDamageValue(), false, Type.DAMAGE); - // TODO see if this tagMatches replacement is good enough? public static final ItemEquality NBT = new ItemEquality(ItemStack::areShareTagsEqual, false, Type.NBT); public static final ItemEquality MOD = new ItemEquality((stack, filter) -> stack.getItem().getCreatorModId(stack).equals(filter.getItem().getCreatorModId(filter)), true, Type.MOD); diff --git a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java index 5edb653..dc7a9a7 100644 --- a/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java +++ b/src/main/java/de/ellpeck/prettypipes/misc/ItemTerminalWidget.java @@ -39,8 +39,6 @@ public class ItemTerminalWidget extends AbstractWidget { @Override protected void renderWidget(GuiGraphics graphics, int p_268034_, int p_268009_, float p_268085_) { var mc = this.screen.getMinecraft(); - var renderer = mc.getItemRenderer(); - // TODO test this new blit offset replacement? graphics.pose().translate(0, 0, 100); if (this.selected) graphics.fill(this.getX(), this.getY(), this.getX() + 16, this.getY() + 16, -2130706433); diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/PipeBlock.java b/src/main/java/de/ellpeck/prettypipes/pipe/PipeBlock.java index 38bdbc3..e3461fa 100644 --- a/src/main/java/de/ellpeck/prettypipes/pipe/PipeBlock.java +++ b/src/main/java/de/ellpeck/prettypipes/pipe/PipeBlock.java @@ -28,6 +28,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.level.material.MapColor; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.CollisionContext; @@ -224,9 +225,9 @@ public class PipeBlock extends BaseEntityBlock { protected static boolean hasLegsTo(Level world, BlockState state, BlockPos pos, Direction direction) { if (state.getBlock() instanceof WallBlock || state.getBlock() instanceof FenceBlock) return direction == Direction.DOWN; - // TODO figure out new condition for legs now that materials are gone -/* if (state.getMaterial() == Material.STONE || state.getMaterial() == Material.METAL) - return Block.canSupportCenter(world, pos, direction.getOpposite());*/ + var mapColor = state.getMapColor(world,pos); + if (mapColor == MapColor.STONE || mapColor == MapColor.METAL) + return Block.canSupportCenter(world, pos, direction.getOpposite()); return false; }