Fix advancement rewards overlays rendering incorrectly

CyclopsMC · Feb 2, 2025 · 04f8057 · 04f8057
1 parent 090426e
commit 04f8057
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/loader-common/src/main/resources/cyclopscore.accesswidener b/loader-common/src/main/resources/cyclopscore.accesswidener
@@ -13,7 +13,7 @@ accessible field net/minecraft/world/inventory/MenuType constructor Lnet/minecra
 mutable field net/minecraft/world/inventory/AbstractContainerMenu slots Lnet/minecraft/core/NonNullList;
 
 # GuiGraphics
-accessible field net/minecraft/client/gui/GuiGraphics bufferSource L/net/minecraft/client/renderer/MultiBufferSource#BufferSource;
+accessible field net/minecraft/client/gui/GuiGraphics bufferSource Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;
 
 # World
 accessible field net/minecraft/world/level/Level thread Ljava/lang/Thread;

diff --git a/loader-common/src/main/resources/data/cyclopscore/info/test.xml b/loader-common/src/main/resources/data/cyclopscore/info/test.xml
@@ -5,6 +5,16 @@
         <paragraph>Lorem &amp;lipsum&amp;r dolor &amp;lsit&amp;r amet, &amp;lconsectetur&amp;r adipiscing &amp;lelit&amp;r. Etiam egestas nisl vel lorem rhoncus consectetur. Donec ut semper arcu. Etiam suscipit, ex ac varius accumsan, dolor nisi consectetur mauris, &amp;lpellentesque viverra erat&amp;r dolor eu turpis. Aliquam dictum, risus aliquet congue scelerisque, nunc elit ullamcorper ante, sit amet vehicula purus purus et nulla. Donec risus neque, ultrices at metus sed, pellentesque imperdiet mi. Etiam imperdiet lectus fermentum, consequat mi et, eleifend elit. Duis felis diam, efficitur id diam et, lacinia elementum libero. Maecenas rutrum nisl tellus, a condimentum elit facilisis sed. </paragraph>
         <paragraph>Fusce massa ipsum, pharetra vel dui a, molestie congue nulla. Etiam maximus vehicula erat maximus tempor. Cras non commodo nisi. Fusce elementum fringilla lacus et rutrum. Proin viverra et augue sit amet malesuada. Phasellus justo sem, pretium nec sem id, molestie scelerisque massa. Aenean id mauris a ligula finibus faucibus. In varius, felis molestie luctus imperdiet, nisi risus elementum lacus, sed aliquam nisi neque vel felis. Morbi et massa neque. Vivamus imperdiet commodo imperdiet. Vivamus id est a diam dapibus convallis volutpat sit amet mauris. Fusce gravida quam et metus lacinia accumsan. Aliquam a consectetur ligula. Pellentesque ut lobortis turpis, nec vulputate lacus. </paragraph>
         <appendix type="minecraft:crafting">minecraft:acacia_boat</appendix>
+        <appendix type="advancement_rewards" id="cyclopscore:dummy_advancement_rewards">
+            <advancements>
+                <advancement id="minecraft:story/mine_stone" />
+                <advancement id="minecraft:adventure/blowback" />
+            </advancements>
+            <rewards>
+                <reward type="item" amount="64">minecraft:oak_log</reward>
+                <reward type="item" amount="10">minecraft:dirt</reward>
+            </rewards>
+        </appendix>
     </section>
     <section name="Section 2">
         <paragraph>Hi!</paragraph>

diff --git a/...rc/main/java/org/cyclops/cyclopscore/infobook/pageelement/AdvancementRewardsAppendix.java b/...rc/main/java/org/cyclops/cyclopscore/infobook/pageelement/AdvancementRewardsAppendix.java
@@ -134,7 +134,10 @@ protected void drawElement(ScreenInfoBook gui, GuiGraphics guiGraphics, int x, i
                 int finalOffsetY = offsetY;
                 advancement.value().display().ifPresent(display -> RecipeAppendix.renderItemForButton(gui, guiGraphics, x + finalOffsetX, y + finalOffsetY, display.getIcon(), mx, my, true, null));
                 if (AdvancementHelpers.hasAdvancementUnlocked(Minecraft.getInstance().player, advancementId)) {
+                    guiGraphics.pose().pushPose();
+                    guiGraphics.pose().translate(0, 0, 1000);
                     Images.OK.draw(guiGraphics, x + offsetX + 1, y + offsetY + 2);
+                    guiGraphics.pose().popPose();
                 } else {
                     allAchievementsValid = false;
                 }
@@ -164,11 +167,14 @@ protected void drawElement(ScreenInfoBook gui, GuiGraphics guiGraphics, int x, i
         // Draw rewards
         for (int i = 0; i < advancementRewards.getRewards().size(); i++) {
             advancementRewards.getRewards().get(i).drawElementInner(gui, guiGraphics, x + rewardPositions[i].x, y + rewardPositions[i].y + offsetY, width, height, page, mx, my, renderButtonHolders.get(rewards[i]));
+            guiGraphics.pose().pushPose();
+            guiGraphics.pose().translate(0, 0, 1000);
             if (taken) {
                 Images.OK.draw(guiGraphics, x + rewardPositions[i].x + 1, y + rewardPositions[i].y + offsetY + 2);
             } else if (!allAchievementsValid) {
                 Images.ERROR.draw(guiGraphics, x + rewardPositions[i].x + 1, y + rewardPositions[i].y + offsetY + 2);
             }
+            guiGraphics.pose().popPose();
         }
     }