Skip to content

Commit 4ec486f

Browse files
zyxkadzyxkad
committed
fix smartglasses module switch tooltip and it may get covered by EMI/JEI
1 parent 7f51d3d commit 4ec486f

5 files changed

Lines changed: 21 additions & 67 deletions

File tree

‎src/main/java/de/srendi/advancedperipherals/client/screens/SmartGlassesScreen.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public class SmartGlassesScreen extends AbstractComputerScreen<SmartGlassesConta
2828
public SmartGlassesScreen(SmartGlassesContainer container, Inventory player, Component title) {
2929
super(container, player, title, TurtleMenu.BORDER);
3030

31-
imageWidth = TEX_WIDTH + AbstractComputerMenu.SIDEBAR_WIDTH;
32-
imageHeight = TEX_HEIGHT;
31+
this.imageWidth = TEX_WIDTH + AbstractComputerMenu.SIDEBAR_WIDTH + 21;
32+
this.imageHeight = TEX_HEIGHT;
3333
}
3434

3535
@Override
@@ -62,16 +62,15 @@ protected void renderBg(@NotNull GuiGraphics graphics, float partialTicks, int m
6262
// graphics.blit(SIDEBAR, leftPos, topPos + sidebarYOffset, AbstractComputerMenu.SIDEBAR_WIDTH, ComputerSidebar.HEIGHT);
6363
}
6464

65-
// TODO:
66-
// @Override
67-
// protected void renderTooltip(@NotNull PoseStack poseStack, int x, int y) {
68-
// super.renderTooltip(poseStack, x, y);
69-
// renderables.forEach(renderable -> {
70-
// if (renderable instanceof SmartGlassesSettingsSwitch smartGlassesSettingsSwitch) {
71-
// smartGlassesSettingsSwitch.renderTooltip(poseStack, x, y);
72-
// }
73-
// });
74-
// }
65+
@Override
66+
protected void renderTooltip(@NotNull GuiGraphics gui, int x, int y) {
67+
super.renderTooltip(gui, x, y);
68+
renderables.forEach(renderable -> {
69+
if (renderable instanceof SmartGlassesSettingsSwitch smartGlassesSettingsSwitch) {
70+
smartGlassesSettingsSwitch.renderTooltip(gui, x, y);
71+
}
72+
});
73+
}
7574

7675
@Override
7776
protected void renderLabels(@NotNull GuiGraphics graphics, int x, int y) {

‎src/main/java/de/srendi/advancedperipherals/client/smartglasses/OverlayModuleLevelRenderer.java‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -46,53 +46,6 @@ public static void renderLevelState(RenderLevelStageEvent event) {
4646
for (List<ThreeDimensionalObject> batch : batches.values()) {
4747
batch.get(0).getObjectRenderer().renderBatch(batch, event, poseStack, view);
4848
}
49-
50-
// TODO: Everything below here is just for debugging and testing. Will be removed before we push to production
51-
// {
52-
// BlockPos blockPos = new BlockPos(2, 100, 0);
53-
54-
// float[] colors = EnumColor.DARK_PURPLE.getRgb();
55-
56-
// RenderSystem.setShader(GameRenderer::getPositionColorShader);
57-
// BufferBuilder bufferbuilder = Tesselator.getInstance().getBuilder(RenderType.translucent().mode(), DefaultVertexFormat.POSITION_COLOR_NORMAL);
58-
// poseStack.pushPose();
59-
60-
// poseStack.translate(-view.x + blockPos.getX(), -view.y + blockPos.getY(), -view.z + blockPos.getZ());
61-
62-
// RenderUtil.drawPlane(poseStack, bufferbuilder, colors[0], colors[1], colors[2], 0.8f, Direction.UP, 0f, 0.5f, 0f, 0.5f, 0f, 1f);
63-
64-
// BufferUploader.drawWithShader(bufferbuilder.buildOrThrow());
65-
// poseStack.popPose();
66-
67-
// VertexConsumer boxVertexConsumer = Minecraft.getInstance().renderBuffers().bufferSource().getBuffer(RenderType.entityCutout(InventoryMenu.BLOCK_ATLAS));
68-
// //RenderSystem.setShader(GameRenderer::getPositionColorLightmapShader);
69-
70-
// //bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_LIGHTMAP);
71-
// poseStack.pushPose();
72-
// colors = EnumColor.WHITE.getRgb();
73-
74-
// blockPos = new BlockPos(0, 100, 0);
75-
// poseStack.translate(-view.x + blockPos.getX(), -view.y + blockPos.getY(), -view.z + blockPos.getZ());
76-
77-
// RenderUtil.drawSphere(poseStack, boxVertexConsumer, 2f, 0f, 0f, 0f, 270f, 0f, 0f, colors[0], colors[1], colors[2], 0.4f, 16, 128);
78-
79-
// //BufferUploader.drawWithShader(bufferbuilder.end());
80-
// poseStack.popPose();
81-
82-
// boxVertexConsumer = Minecraft.getInstance().renderBuffers().bufferSource().getBuffer(RenderType.entityCutout(InventoryMenu.BLOCK_ATLAS));
83-
84-
// //bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_NORMAL);
85-
// poseStack.pushPose();
86-
87-
// colors = EnumColor.WHITE.getRgb();
88-
// blockPos = new BlockPos(6, 100, 0);
89-
// poseStack.translate(-view.x + blockPos.getX(), -view.y + blockPos.getY(), -view.z + blockPos.getZ());
90-
91-
// RenderUtil.drawTorus(poseStack, boxVertexConsumer, 1f, 0.4f, 0f, 0f, 0f, 0f, 0f, 0f, colors[0], colors[1], colors[2], 1f, 48, 48);
92-
93-
// //BufferUploader.drawWithShader(bufferbuilder.end());
94-
// poseStack.popPose();
95-
// }
9649
}
9750
}
9851
}

‎src/main/java/de/srendi/advancedperipherals/client/widgets/SmartGlassesSettingsSwitch.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ public void onClick(double mouseX, double mouseY) {
5555
this.isEnabled = true;
5656
}
5757

58-
// TODO:
59-
// public void renderTooltip(PoseStack poseStack, int x, int y) {
60-
// if (screen != null && isMouseOver(x, y))
61-
// screen.renderComponentTooltip(poseStack, Collections.singletonList(type.getName()), x, y);
62-
// }
58+
public void renderTooltip(GuiGraphics gui, int x, int y) {
59+
if (screen != null && isMouseOver(x, y)) {
60+
gui.renderTooltip(gui.minecraft.font, type.getName(), x, y);
61+
}
62+
}
6363

6464
@Override
6565
protected void updateWidgetNarration(@NotNull NarrationElementOutput pNarrationElementOutput) {

‎src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChunkyPeripheral.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public int getRadius() {
5353

5454
@Override
5555
public void update() {
56-
// TODO: should find someway to update after turtle moved or while moving, but not every tick
56+
// supressedTODO: should find someway to update after turtle moved or while moving, but not every tick
5757
ServerLevel level = (ServerLevel) getLevel();
5858
ChunkManager manager = ChunkManager.get(level.getServer());
5959
ChunkPos currentChunk = getChunkPos();

‎src/main/java/de/srendi/advancedperipherals/common/util/TeleportUtil.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@
44
import net.minecraft.server.level.ServerPlayer;
55
import net.minecraft.world.entity.Entity;
66
import net.minecraft.world.phys.Vec3;
7+
import org.jetbrains.annotations.NotNull;
8+
import org.jetbrains.annotations.Nullable;
79

810
import java.util.ArrayList;
911
import java.util.List;
1012

1113
public final class TeleportUtil {
1214
private TeleportUtil() {}
1315

14-
public static <T extends Entity> T teleportToWithPassengers(T entity, ServerLevel newLevel, Vec3 newPos) {
16+
@Nullable
17+
public static <T extends Entity> T teleportToWithPassengers(@NotNull T entity, ServerLevel newLevel, Vec3 newPos) {
1518
Vec3 oldPos = entity.position();
1619
List<Entity> passengers = new ArrayList<>(entity.getPassengers());
1720
T newEntity;
1821
if (entity instanceof ServerPlayer player) {
19-
// TODO <1.20.1>: player will be reconstruct in 1.20.1
2022
player.teleportTo(newLevel, newPos.x, newPos.y, newPos.z, player.getYRot(), player.getXRot());
2123
newEntity = entity;
2224
} else {

0 commit comments

Comments
 (0)