From e73a08e6672fb380cab8db71340158969c5ef56b Mon Sep 17 00:00:00 2001
From: isXander <xander@isxander.dev>
Date: Sat, 19 Oct 2024 19:22:45 +0100
Subject: 3.6.0

---
 .../gui/controllers/dropdown/DropdownWidget.java      | 19 +++++++++++--------
 .../controllers/dropdown/ItemControllerElement.java   | 10 ++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'src/main/java/dev/isxander/yacl3/gui/controllers/dropdown')

diff --git a/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/DropdownWidget.java b/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/DropdownWidget.java
index f799059..464571e 100644
--- a/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/DropdownWidget.java
+++ b/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/DropdownWidget.java
@@ -5,6 +5,7 @@ import dev.isxander.yacl3.api.utils.Dimension;
 import dev.isxander.yacl3.api.utils.MutableDimension;
 import dev.isxander.yacl3.gui.YACLScreen;
 import dev.isxander.yacl3.gui.controllers.ControllerPopupWidget;
+import dev.isxander.yacl3.gui.utils.GuiUtils;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -59,26 +60,28 @@ public class DropdownWidget<T> extends ControllerPopupWidget<AbstractDropdownCon
 		matrices.translate(0, 0, 200);
 
 		// Background
-		graphics.setColor(0.25f, 0.25f, 0.25f, 1.0f);
-		graphics.blit(
+		//graphics.setColor(0.25f, 0.25f, 0.25f, 1.0f);
+		GuiUtils.blitGuiTexColor(
+                graphics,
 				/*? if >1.20.4 {*/
 				Screen.MENU_BACKGROUND,
 				/*?} else {*/
 				/*Screen.BACKGROUND_LOCATION,
 				*//*?}*/
-				dropdownDim.x(), dropdownDim.y(), 0,
+				dropdownDim.x(), dropdownDim.y(),
 				0.0f, 0.0f,
 				dropdownDim.width(), dropdownDim.height(),
-				32, 32
+				32, 32,
+                0xFF3F3F3F
 		);
-		graphics.setColor(1.0f, 1.0f, 1.0f, 1.0f);
+		//graphics.setColor(1.0f, 1.0f, 1.0f, 1.0f);
 		graphics.renderOutline(dropdownDim.x(), dropdownDim.y(), dropdownDim.width(), dropdownDim.height(), -1);
 
 		// Highlight the currently selected element
-		graphics.setColor(0.0f, 0.0f, 0.0f, 0.5f);
+		//graphics.setColor(0.0f, 0.0f, 0.0f, 0.5f);
 		int y = dropdownDim.y() + 2 + entryHeight() * selectedVisibleIndex();
-		graphics.fill(dropdownDim.x(), y, dropdownDim.xLimit(), y + entryHeight(), -1);
-		graphics.setColor(1.0f, 1.0f, 1.0f, 1.0f);
+		graphics.fill(dropdownDim.x(), y, dropdownDim.xLimit(), y + entryHeight(), 0x7F000000);
+		//graphics.setColor(1.0f, 1.0f, 1.0f, 1.0f);
 		graphics.renderOutline(dropdownDim.x(), y, dropdownDim.width(), entryHeight(), -1);
 
 		// Render all visible elements
diff --git a/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java b/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java
index 2c19c13..37911de 100644
--- a/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java
+++ b/src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/ItemControllerElement.java
@@ -3,6 +3,7 @@ package dev.isxander.yacl3.gui.controllers.dropdown;
 import dev.isxander.yacl3.api.utils.Dimension;
 import dev.isxander.yacl3.gui.YACLScreen;
 import dev.isxander.yacl3.gui.utils.ItemRegistryHelper;
+import dev.isxander.yacl3.gui.utils.MiscUtil;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
@@ -43,7 +44,7 @@ public class ItemControllerElement extends AbstractDropdownControllerElement<Ite
 		List<ResourceLocation> identifiers = ItemRegistryHelper.getMatchingItemIdentifiers(inputField).toList();
 		currentItem = ItemRegistryHelper.getItemFromName(inputField, null);
 		for (ResourceLocation identifier : identifiers) {
-			matchingItems.put(identifier, BuiltInRegistries.ITEM.get(identifier));
+			matchingItems.put(identifier, MiscUtil.getFromRegistry(BuiltInRegistries.ITEM, identifier));
 		}
 		return identifiers;
 	}
@@ -86,6 +87,11 @@ public class ItemControllerElement extends AbstractDropdownControllerElement<Ite
 		if (inputFieldFocused)
 			return Component.literal(inputField);
 
-		return itemController.option().pendingValue().getDescription();
+		return itemController.option().pendingValue()
+                //? if >=1.21.2 {
+                .getName();
+                //?} else {
+                /*.getDescription();
+                *///?}
 	}
 }
-- 
cgit