Refactor selection list rendering and lower opacity of hovered/selected GUI elements

Author: MattCzyr

src/main/java/com/chaosthedude/explorerscompass/gui/StructureSearchEntry.java

@@ -55,17 +55,12 @@ public StructureSearchEntry(StructureSearchList structuresList, Identifier struc
 
 	@Override
 	public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean isHovering, float partialTick) {
-		int maxTextWidth = getWidth() - 10;
-
 		if (xpLevels > 0) {
 			int spriteSize = (int) (getHeight() * 0.4F);
 			int spriteBorder = (getHeight() - spriteSize) / 2;
 			int spriteIndex = xpLevels - 1;
 			Identifier spriteId = isEnabled() ? ENABLED_LEVEL_SPRITES[spriteIndex] : DISABLED_LEVEL_SPRITES[spriteIndex];
 			guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, spriteId, getX() + getWidth() - spriteSize - spriteBorder, getY() + spriteBorder, spriteSize, spriteSize);
-
-			// XP sprite is rendered, need extra room for it
-			maxTextWidth = getWidth() - getHeight() - 5;
 		}
 
 		int nameColor = isEnabled() ? 0xffffffff : 0xff808080;

src/main/java/com/chaosthedude/explorerscompass/gui/StructureSearchList.java

@@ -13,13 +13,11 @@ public class StructureSearchList extends ObjectSelectionList<StructureSearchEntr
 
 	private final ExplorersCompassScreen parentScreen;
 	private Player player;
-	private int itemHeight;
 
 	public StructureSearchList(ExplorersCompassScreen parentScreen, Minecraft mc, Player player, int width, int height, int y, int itemHeight) {
 		super(mc, width, height, y, itemHeight);
 		this.parentScreen = parentScreen;
 		this.player = player;
-		this.itemHeight = itemHeight;
 		refreshList();
 	}
 
@@ -34,19 +32,33 @@ public int getRowWidth() {
 	}
 
 	@Override
-	public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
-		enableScissor(guiGraphics);
+    public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+        enableScissor(guiGraphics);
+        renderListBackground(guiGraphics);
+        renderListItems(guiGraphics, mouseX, mouseY, partialTicks);
+        guiGraphics.disableScissor();
+        renderScrollbar(guiGraphics, mouseX, mouseY);
+    }
+	
+	@Override
+	protected void renderListBackground(GuiGraphics guiGraphics) {
 		for (int i = 0; i < getItemCount(); ++i) {
 			if (getRowBottom(i) >= getY() && getRowTop(i) <= getBottom()) {
 				StructureSearchEntry entry = children().get(i);
 				int fillColor = RenderUtils.getBackgroundColor(entry.isEnabled(), entry == getSelected());
-				guiGraphics.fill(getRowLeft(), getRowTop(i), getRowLeft() + getRowWidth(), getRowTop(i) + itemHeight, fillColor);
-				entry.renderContent(guiGraphics, mouseX, mouseY, entry == getHovered(), partialTicks);
+				guiGraphics.fill(getRowLeft(), getRowTop(i), getRowLeft() + getRowWidth(), getRowTop(i) + defaultEntryHeight, fillColor);
 			}
 		}
-		guiGraphics.disableScissor();
-
-		if (maxScrollAmount() > 0) {
+	}
+	
+	@Override
+	protected void renderSelection(GuiGraphics guiGraphics, StructureSearchEntry entry, int backgroundColor) {
+		// Selection is rendered in renderListBackground()
+	}
+	
+	@Override
+	protected void renderScrollbar(GuiGraphics guiGraphics, int mouseX, int mouseY) {
+		if (scrollbarVisible()) {
 			int left = scrollBarX();
 			int right = left + 6;
 			int height = (int) ((float) ((getBottom() - getY()) * (getBottom() - getY())) / (float) contentHeight());
@@ -55,22 +67,14 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
 			if (top < getY()) {
 				top = getY();
 			}
-
-			guiGraphics.fill(left, getY(), right, getBottom(), (int) (2.35F * 255.0F) / 2 << 24);
-			guiGraphics.fill(left, top, right, top + height, (int) (1.9F * 255.0F) / 2 << 24);
+			
+			int backgroundFillColor = RenderUtils.getBackgroundColor(false, false);
+			int scrollbarFillColor = RenderUtils.getBackgroundColor(true, true);
+			guiGraphics.fill(left, getY(), right, getBottom(), backgroundFillColor);
+			guiGraphics.fill(left, top, right, top + height, scrollbarFillColor);
 		}
 	}
 
-	@Override
-	protected void enableScissor(GuiGraphics guiGraphics) {
-		guiGraphics.enableScissor(getX(), getY(), getRight(), getBottom());
-	}
-
-	@Override
-	public int getRowBottom(int index) {
-		return getRowTop(index) + itemHeight;
-	}
-
 	public void refreshList() {
 		clearEntries();
 		for (Identifier structureId : parentScreen.sortStructures()) {

src/main/java/com/chaosthedude/explorerscompass/util/RenderUtils.java

@@ -36,7 +36,7 @@ public static int getBackgroundColor(boolean active, boolean hovered) {
 		if (!active) {
 			state = 5;
 		} else if (hovered) {
-			state = 4;
+			state = 3;
 		}
 		final float f = state / 2 * 0.9F + 0.1F;
 		final int color = (int) (255.0F * f);