Merge branch 'MeeniMc-1.20.4'

way2muchnoise · Jan 26, 2024 · edb21c1 · edb21c1
2 parents 7a2ac13 + 80daa5c
commit edb21c1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/Common/src/main/java/betteradvancements/common/gui/BetterAdvancementTab.java b/Common/src/main/java/betteradvancements/common/gui/BetterAdvancementTab.java
@@ -81,7 +81,7 @@ public void drawContents(GuiGraphics guiGraphics, int left, int top, int width,
         guiGraphics.enableScissor(left, top, left + width, top + height);
         guiGraphics.pose().pushPose();
         guiGraphics.pose().translate(left, top, 0);
-        ResourceLocation resourcelocation = Objects.requireNonNullElse(this.display.getBackground(), TextureManager.INTENTIONAL_MISSING_TEXTURE);
+        ResourceLocation resourcelocation = this.display.getBackground().orElse(TextureManager.INTENTIONAL_MISSING_TEXTURE);
 
         int i = this.scrollX % 16;
         int j = this.scrollY % 16;

diff --git a/Common/src/main/java/betteradvancements/common/gui/BetterAdvancementWidget.java b/Common/src/main/java/betteradvancements/common/gui/BetterAdvancementWidget.java
@@ -81,7 +81,7 @@ private void refreshHover() {
         this.description = Language.getInstance().getVisualOrder(
             this.findOptimalLines(ComponentUtils.mergeStyles(
                 displayInfo.getDescription().copy(),
-                Style.EMPTY.withColor(displayInfo.getFrame().getChatColor())
+                Style.EMPTY.withColor(displayInfo.getType().getChatColor())
             ), maxWidth));
 
         for (FormattedCharSequence line : this.description) {
@@ -227,7 +227,7 @@ public void draw(GuiGraphics guiGraphics, int scrollX, int scrollY) {
 
             RenderUtil.setColor(betterDisplayInfo.getIconColor(advancementState));
             RenderSystem.enableBlend();
-            guiGraphics.blitSprite(advancementState.frameSprite(this.displayInfo.getFrame()), scrollX + this.x + 3, scrollY + this.y, ICON_SIZE, ICON_SIZE);
+            guiGraphics.blitSprite(advancementState.frameSprite(this.displayInfo.getType()), scrollX + this.x + 3, scrollY + this.y, ICON_SIZE, ICON_SIZE);
             RenderUtil.setColor(betterDisplayInfo.defaultIconColor());
             guiGraphics.renderFakeItem(this.displayInfo.getIcon(), scrollX + this.x + 8, scrollY + this.y + 5);
         }
@@ -336,7 +336,7 @@ public void drawHover(GuiGraphics guiGraphics, int scrollX, int scrollY, float f
         }
         // Advancement icon
         RenderUtil.setColor(betterDisplayInfo.getIconColor(stateIcon));
-        guiGraphics.blitSprite(stateIcon.frameSprite(this.displayInfo.getFrame()), scrollX + this.x + 3, scrollY + this.y, ICON_SIZE, ICON_SIZE);
+        guiGraphics.blitSprite(stateIcon.frameSprite(this.displayInfo.getType()), scrollX + this.x + 3, scrollY + this.y, ICON_SIZE, ICON_SIZE);
         RenderUtil.setColor(betterDisplayInfo.defaultIconColor());
 
         if (drawLeft) {

diff --git a/NeoForge/src/main/resources/META-INF/mods.toml b/NeoForge/src/main/resources/META-INF/mods.toml
@@ -25,7 +25,7 @@ Improvements to the advancements screen.
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
 [[dependencies.betteradvancements]]
 modId="neoforge" #mandatory
-mandatory=true #mandatory
+type="required" #mandatory
 versionRange="${neoforgeVersionRange}" #mandatory
 # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
 ordering="NONE"
@@ -34,7 +34,7 @@ side="CLIENT"
 
 [[dependencies.betteradvancements]]
 modId="minecraft" #mandatory
-mandatory=true #mandatory
+type="required" #mandatory
 versionRange="${minecraftVersionRange}" #mandatory
 # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
 ordering="NONE"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ import net.fabricmc.loom.task.RemapJarTask
 plugins {
     base
     id("architectury-plugin") version ("3.4-SNAPSHOT")
-    id("dev.architectury.loom") version ("1.4-SNAPSHOT") apply (false)
+    id("dev.architectury.loom") version ("1.5-SNAPSHOT") apply (false)
     id("com.github.johnrengelman.shadow") version ("7.1.2") apply (false)
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,36 +15,36 @@ githubUrl=https://github.com/way2muchnoise/BetterAdvancements
 platforms=fabric,forge,neoforge
 
 # Minecraft
-minecraftVersion=1.20.2
+minecraftVersion=1.20.4
 minecraftVersionRange=[1.20, 1.21)
 
 # Forge
-forgeVersion=48.1.0
-loaderVersionRange=[48,)
-forgeVersionRange=[48.0.0,)
+forgeVersion=49.0.22
+loaderVersionRange=[49,)
+forgeVersionRange=[49.0.0,)
 
 # Fabric
-fabricVersion=0.91.2+1.20.2
-fabricLoaderVersion=0.15.3
+fabricVersion=0.95.1+1.20.4
+fabricLoaderVersion=0.15.6
 
 # NeoForge
-neoforgeVersion=20.2.88
+neoforgeVersion=20.4.134-beta
 neoforgeLoaderVersionRange=[1,)
-neoforgeVersionRange=[20.2.0,)
+neoforgeVersionRange=[20.4.0,)
 
 # Fabric Config screen
-clothVersion=12.0.119
-modMenuVersion=8.0.1
+clothVersion=13.0.121
+modMenuVersion=9.0.0
 
 # Mappings
 mappingsChannel=parchment
-mappingsParchmentMinecraftVersion=1.20.2
-mappingsParchmentVersion=2023.12.10
+mappingsParchmentMinecraftVersion=1.20.3
+mappingsParchmentVersion=2023.12.31
 
 # Publishing
 curseProjectId=272515
 curseHomepageLink=https://www.curseforge.com/minecraft/mc-mods/better-advancements
 modrinthProjectId=Q2OqKxDG
 
 # Version
-specificationVersion=0.4.0
+specificationVersion=0.4.0