From f15e712815ca653c6b4fe384e04e671d0adf0179 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 28 Apr 2022 14:17:32 +0800 Subject: Update to 22w17a --- runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java | 4 ++-- .../shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java | 2 +- .../impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java | 3 +-- .../rei/impl/client/gui/widget/search/OverlaySearchField.java | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'runtime/src/main/java/me/shedaniel') diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java index a2b7cd9b6..2825a2ffb 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java @@ -121,9 +121,9 @@ public class RoughlyEnoughItemsNetwork { } NetworkManager.sendToPlayer(player, NOT_ENOUGH_ITEMS_PACKET, buf);*/ } catch (IllegalStateException e) { - player.sendMessage(Component.translatable(e.getMessage()).withStyle(ChatFormatting.RED), Util.NIL_UUID); + player.sendSystemMessage(Component.translatable(e.getMessage()).withStyle(ChatFormatting.RED)); } catch (Exception e) { - player.sendMessage(Component.translatable("error.rei.internal.error", e.getMessage()).withStyle(ChatFormatting.RED), Util.NIL_UUID); + player.sendSystemMessage(Component.translatable("error.rei.internal.error", e.getMessage()).withStyle(ChatFormatting.RED)); e.printStackTrace(); } } catch (Exception e) { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java index 9625571b7..2c232ae2a 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java @@ -161,7 +161,7 @@ public class PerformanceScreen extends Screen { entries.sort(Comparator.comparingLong(value -> value.time).reversed()); list.addItem(new SubCategoryListEntry(Component.literal(stage), (List) (List) entries, Math.max(inner.totalNano(), separateTime), false)); }); - list.children().add(0, new EntryListEntry(new TextComponent("Total Load Time"), totalTime[0])); + list.children().add(0, new EntryListEntry(Component.literal("Total Load Time"), totalTime[0])); addWidget(list); } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java index afdddd38e..afc94b2d5 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java @@ -69,7 +69,6 @@ public final class TexturedDrawableConsumer implements DrawableConsumer { bufferBuilder.vertex(matrix, xEnd, yEnd, z).uv(uEnd, vEnd).endVertex(); bufferBuilder.vertex(matrix, xEnd, yStart, z).uv(uEnd, vStart).endVertex(); bufferBuilder.vertex(matrix, xStart, yStart, z).uv(uStart, vStart).endVertex(); - bufferBuilder.end(); - BufferUploader.drawWithShader(bufferBuilder); + BufferUploader.drawWithShader(bufferBuilder.end()); } } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java index e9e68f206..951059664 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java @@ -203,8 +203,7 @@ public class OverlaySearchField extends TextFieldWidget implements TextFieldWidg fillGradient(pose, bufferBuilder, x + 1, y + height - 3, x + progressWidth - 1, y + height - 1, 400, 0xffffffff, 0xffffffff); } - bufferBuilder.end(); - BufferUploader.drawWithShader(bufferBuilder); + BufferUploader.drawWithShader(bufferBuilder.end()); poses.pushPose(); poses.translate(0.0D, 0.0D, 400.0D); for (int i = 0; i < sequences.size(); i++) { -- cgit