v1.5.1 - Code cleanup and fix some alignment issues

Author: Prospector

README.md

@@ -25,4 +25,4 @@ A picture's worth 2 words
   }
   ```
     - Features
-        - Mods can provide a Supplier<Screen> to provide a custom config screen to open with the config button. Implement the `getConfigScreen` method in your API implementation.
+        - Mods can provide a Screen factory to provide a custom config screen to open with the config button. Implement the `getConfigScreenFactory` method in your API implementation.

build.gradle

@@ -28,7 +28,7 @@ targetCompatibility = 1.8
 
 group = "io.github.prospector.modmenu"
 archivesBaseName = "ModMenu"
-version = "1.5.0"
+version = "1.5.1"
 
 def ENV = System.getenv()
 if (ENV.BUILD_NUMBER) {

src/main/java/io/github/prospector/modmenu/gui/DescriptionListWidget.java

@@ -6,9 +6,9 @@
 
 public class DescriptionListWidget extends EntryListWidget<DescriptionListWidget.DescriptionItem> {
 
+	private final ModListScreen parent;
+	private final TextRenderer textRenderer;
 	private ModListEntry lastSelected = null;
-	private ModListScreen parent;
-	private TextRenderer textRenderer;
 
 	public DescriptionListWidget(MinecraftClient client, int width, int height, int top, int bottom, int entryHeight, ModListScreen parent) {
 		super(client, width, height, top, bottom, entryHeight);
@@ -32,16 +32,20 @@ protected int getScrollbarPosition() {
 	}
 
 	@Override
-	public void render(int int_1, int int_2, float float_1) {
-		if (parent.getModList().getSelected() != lastSelected) {
-			lastSelected = parent.getModList().getSelected();
+	public void render(int mouseX, int mouseY, float delta) {
+		ModListEntry selectedEntry = parent.getModList().getSelected();
+		if (selectedEntry != lastSelected) {
+			lastSelected = selectedEntry;
 			clearEntries();
 			setScrollAmount(-Double.MAX_VALUE);
-			if (lastSelected != null && lastSelected.metadata.getDescription() != null && !lastSelected.metadata.getDescription().isEmpty())
-				for (String line : textRenderer.wrapStringToWidthAsList(lastSelected.metadata.getDescription().replaceAll("\n", "\n\n"), getRowWidth()))
+			String description = lastSelected.getMetadata().getDescription();
+			if (lastSelected != null && description != null && !description.isEmpty()) {
+				for (String line : textRenderer.wrapStringToWidthAsList(description.replaceAll("\n", "\n\n"), getRowWidth())) {
 					children().add(new DescriptionItem(line));
+				}
+			}
 		}
-		super.render(int_1, int_2, float_1);
+		super.render(mouseX, mouseY, delta);
 	}
 
 	protected class DescriptionItem extends EntryListWidget.Entry<DescriptionItem> {

src/main/java/io/github/prospector/modmenu/gui/ModListEntry.java

@@ -19,39 +19,40 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
+import java.util.Objects;
 
 public class ModListEntry extends AlwaysSelectedEntryListWidget.Entry<ModListEntry> implements AutoCloseable {
+	public static final Identifier UNKNOWN_ICON = new Identifier("textures/misc/unknown_pack.png");
 	private static final Logger LOGGER = LogManager.getLogger();
 	private final MinecraftClient client;
-	public ModContainer container;
-	public ModMetadata metadata;
-	public ModListWidget list;
-	public final Identifier iconLocation;
-	public final NativeImageBackedTexture icon;
-	public static final Identifier unknownIcon = new Identifier("textures/misc/unknown_pack.png");
+	private final ModContainer container;
+	private final ModMetadata metadata;
+	private final ModListWidget list;
+	private final Identifier iconLocation;
+	private final NativeImageBackedTexture icon;
 
 	public ModListEntry(ModContainer container, ModListWidget list) {
 		this.container = container;
 		this.list = list;
 		this.metadata = container.getMetadata();
 		this.client = MinecraftClient.getInstance();
 		this.iconLocation = new Identifier("modmenu", metadata.getId() + "_icon");
-		this.icon = this.getIcon();
+		this.icon = this.createIcon();
 	}
 
 	@Override
 	public void render(int index, int y, int x, int rowWidth, int rowHeight, int mouseX, int mouseY, boolean isSelected, float delta) {
 		GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-		this.client.getTextureManager().bindTexture(this.icon != null ? this.iconLocation : unknownIcon);
+		this.client.getTextureManager().bindTexture(this.icon != null ? this.iconLocation : UNKNOWN_ICON);
 		GlStateManager.enableBlend();
 		DrawableHelper.blit(x, y, 0.0F, 0.0F, 32, 32, 32, 32);
 		GlStateManager.disableBlend();
 		this.client.textRenderer.draw(metadata.getName(), (float) (x + 32 + 3), (float) (y + 1), 0xFFFFFF);
-		new BadgeRenderer(x + 32 + 3 + this.client.textRenderer.getStringWidth(metadata.getName()) + 2, y, rowWidth, metadata, list.parent).draw(mouseX, mouseY);
-		RenderUtils.drawWrappedString(metadata.getDescription(), (x + 32 + 3 + 4), (y + client.textRenderer.fontHeight + 2), rowWidth - 32 - 3 - 25 - 4, 2, 0x808080);
+		new BadgeRenderer(x + 32 + 3 + this.client.textRenderer.getStringWidth(metadata.getName()) + 2, y, rowWidth, metadata, list.getParent()).draw(mouseX, mouseY);
+		RenderUtils.drawWrappedString(metadata.getDescription(), (x + 32 + 3 + 4), (y + client.textRenderer.fontHeight + 2), rowWidth - 32 - 3, 2, 0x808080);
 	}
 
-	private NativeImageBackedTexture getIcon() {
+	private NativeImageBackedTexture createIcon() {
 		try {
 			InputStream inputStream;
 			try {
@@ -66,7 +67,7 @@ private NativeImageBackedTexture getIcon() {
 			Throwable var3 = null;
 			NativeImageBackedTexture var6;
 			try {
-				NativeImage image = NativeImage.fromInputStream(inputStream);
+				NativeImage image = NativeImage.fromInputStream(Objects.requireNonNull(inputStream));
 				Validate.validState(image.getHeight() == image.getWidth(), "Must be square icon");
 				NativeImageBackedTexture var5 = new NativeImageBackedTexture(image);
 				this.client.getTextureManager().registerTexture(this.iconLocation, var5);
@@ -102,10 +103,22 @@ public boolean mouseClicked(double v, double v1, int i) {
 		return true;
 	}
 
+	@Override
 	public void close() {
 		if (this.icon != null) {
 			this.icon.close();
 		}
+	}
+
+	public ModMetadata getMetadata() {
+		return metadata;
+	}
+
+	public Identifier getIconLocation() {
+		return iconLocation;
+	}
 
+	public NativeImageBackedTexture getIcon() {
+		return icon;
 	}
 }

src/main/java/io/github/prospector/modmenu/gui/ModListScreen.java

@@ -28,25 +28,26 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class ModListScreen extends Screen {
+	private static final Identifier CONFIGURE_BUTTON_LOCATION = new Identifier("modmenu", "textures/gui/configure_button.png");
 	private static final Logger LOGGER = LogManager.getLogger();
-	public static final Identifier CONFIGURE_BUTTON_LOCATION = new Identifier("modmenu", "textures/gui/configure_button.png");
-	protected String textTitle;
-	protected TextFieldWidget searchBox;
-	protected DescriptionListWidget descriptionListWidget;
-	protected Screen parent;
-	protected ModListWidget modList;
-	protected String tooltip;
-	protected ModListEntry selected;
-	protected BadgeRenderer badgeRenderer;
-	protected double scrollPercent = 0;
-	int leftPaneX;
-	boolean init = false;
-	int leftPaneRight;
-	int paneY;
-	int paneWidth;
-	int rightPaneX;
+	private final String textTitle;
+	private TextFieldWidget searchBox;
+	private DescriptionListWidget descriptionListWidget;
+	private Screen parent;
+	private ModListWidget modList;
+	private String tooltip;
+	private ModListEntry selected;
+	private BadgeRenderer badgeRenderer;
+	private double scrollPercent = 0;
+	private int leftPaneX;
+	private boolean init = false;
+	private int leftPaneRight;
+	private int paneY;
+	private int paneWidth;
+	private int rightPaneX;
 
 	public ModListScreen(Screen previousGui) {
 		super(ModMenu.noFabric ? new StringTextComponent("Mods") : new TranslatableTextComponent("modmenu.title"));
@@ -70,7 +71,7 @@ public void tick() {
 
 	@Override
 	protected void init() {
-		this.minecraft.keyboard.enableRepeatEvents(true);
+		Objects.requireNonNull(this.minecraft).keyboard.enableRepeatEvents(true);
 		leftPaneX = 4;
 		leftPaneRight = width / 2 - 4;
 		paneY = 48;
@@ -86,7 +87,8 @@ protected void init() {
 		this.descriptionListWidget = new DescriptionListWidget(this.minecraft, paneWidth, this.height, paneY + 60, this.height - 36, font.fontHeight + 1, this);
 		this.descriptionListWidget.setLeftPos(rightPaneX);
 		final ModListEntry selectedEntry = modList.getSelected();
-		final String modid = selectedEntry.metadata.getId();
+		final ModMetadata metadata = Objects.requireNonNull(selectedEntry).getMetadata();
+		final String modid = metadata.getId();
 		ButtonWidget configureButton = new TexturedButtonWidget(width - 24, paneY, 20, 20, 0, 0, CONFIGURE_BUTTON_LOCATION, 32, 64, button -> {
 			final Screen screen = ModMenu.getConfigScreen(modid, this);
 			if (screen != null) {
@@ -108,27 +110,27 @@ public void render(int mouseX, int mouseY, float delta) {
 		ButtonWidget websiteButton = new ButtonWidget(rightPaneX + (urlButtonWidths / 2) - (cappedButtonWidth / 2), paneY + 36, urlButtonWidths > 200 ? 200 : urlButtonWidths, 20,
 			ModMenu.noFabric ? "Website" : I18n.translate("modmenu.website"), button -> this.minecraft.openScreen(new ConfirmChatLinkScreen((bool) -> {
 			if (bool) {
-				SystemUtil.getOperatingSystem().open(selectedEntry.metadata.getContact().get("homepage").get());
+				SystemUtil.getOperatingSystem().open(metadata.getContact().get("homepage").get());
 			}
 			this.minecraft.openScreen(this);
-		}, selectedEntry.metadata.getContact().get("homepage").get(), true))) {
+		}, metadata.getContact().get("homepage").get(), true))) {
 			@Override
 			public void render(int var1, int var2, float var3) {
-				active = selectedEntry.metadata.getContact().get("homepage").isPresent();
+				active = metadata.getContact().get("homepage").isPresent();
 				visible = true;
 				super.render(var1, var2, var3);
 			}
 		};
 		ButtonWidget issuesButton = new ButtonWidget(rightPaneX + urlButtonWidths + 4 + (urlButtonWidths / 2) - (cappedButtonWidth / 2), paneY + 36, urlButtonWidths > 200 ? 200 : urlButtonWidths, 20,
 			ModMenu.noFabric ? "Issues" : I18n.translate("modmenu.issues"), button -> this.minecraft.openScreen(new ConfirmChatLinkScreen((bool) -> {
 			if (bool) {
-				SystemUtil.getOperatingSystem().open(selectedEntry.metadata.getContact().get("issues").get());
+				SystemUtil.getOperatingSystem().open(metadata.getContact().get("issues").get());
 			}
 			this.minecraft.openScreen(this);
-		}, selectedEntry.metadata.getContact().get("issues").get(), true))) {
+		}, metadata.getContact().get("issues").get(), true))) {
 			@Override
 			public void render(int var1, int var2, float var3) {
-				active = selectedEntry.metadata.getContact().get("issues").isPresent();
+				active = metadata.getContact().get("issues").isPresent();
 				visible = true;
 				super.render(var1, var2, var3);
 			}
@@ -177,10 +179,10 @@ public void render(int mouseX, int mouseY, float delta) {
 		this.drawCenteredString(this.font, this.textTitle, this.modList.getWidth() / 2, 8, 16777215);
 		super.render(mouseX, mouseY, delta);
 
-		ModMetadata metadata = modList.getSelected().metadata;
+		ModMetadata metadata = modList.getSelected().getMetadata();
 		int x = rightPaneX;
 		GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-		this.minecraft.getTextureManager().bindTexture(selected.icon != null ? selected.iconLocation : ModListEntry.unknownIcon);
+		Objects.requireNonNull(this.minecraft).getTextureManager().bindTexture(selected.getIcon() != null ? selected.getIconLocation() : ModListEntry.UNKNOWN_ICON);
 		GlStateManager.enableBlend();
 		blit(x, paneY, 0.0F, 0.0F, 32, 32, 32, 32);
 		GlStateManager.disableBlend();
@@ -190,7 +192,7 @@ public void render(int mouseX, int mouseY, float delta) {
 		if (mouseX > x + imageOffset && mouseY > paneY + 1 && mouseY < paneY + 1 + font.fontHeight && mouseX < x + imageOffset + font.getStringWidth(metadata.getName())) {
 			setTooltip(I18n.translate("modmenu.modIdToolTip", metadata.getId()));
 		}
-		if (init || badgeRenderer == null || badgeRenderer.metadata != metadata) {
+		if (init || badgeRenderer == null || badgeRenderer.getMetadata() != metadata) {
 			badgeRenderer = new BadgeRenderer(x + imageOffset + this.minecraft.textRenderer.getStringWidth(metadata.getName()) + 2, paneY, width - 28, metadata, this);
 			init = false;
 		}
@@ -216,9 +218,8 @@ public void render(int mouseX, int mouseY, float delta) {
 	protected void overlayBackground(int x1, int y1, int x2, int y2, int red, int green, int blue, int startAlpha, int endAlpha) {
 		Tessellator tessellator = Tessellator.getInstance();
 		BufferBuilder buffer = tessellator.getBufferBuilder();
-		minecraft.getTextureManager().bindTexture(DrawableHelper.BACKGROUND_LOCATION);
+		Objects.requireNonNull(minecraft).getTextureManager().bindTexture(DrawableHelper.BACKGROUND_LOCATION);
 		GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-		float f = 32.0F;
 		buffer.begin(7, VertexFormats.POSITION_UV_COLOR);
 		buffer.vertex(x1, y2, 0.0D).texture(x1 / 32.0D, y2 / 32.0D).color(red, green, blue, endAlpha).next();
 		buffer.vertex(x2, y2, 0.0D).texture(x2 / 32.0D, y2 / 32.0D).color(red, green, blue, endAlpha).next();
@@ -230,4 +231,20 @@ protected void overlayBackground(int x1, int y1, int x2, int y2, int red, int gr
 	public void setTooltip(String tooltip) {
 		this.tooltip = tooltip;
 	}
+
+	public ModListEntry getSelectedEntry() {
+		return selected;
+	}
+
+	public void updateSelectedEntry(ModListEntry entry) {
+		this.selected = entry;
+	}
+
+	public double getScrollPercent() {
+		return scrollPercent;
+	}
+
+	public void updateScrollPercent(double scrollPercent) {
+		this.scrollPercent = scrollPercent;
+	}
 }