feat: update to 1.21.9

Author: Jamalam360

CHANGELOG.md

@@ -1 +1 @@
-Update to 1.21.7
+Update to 1.21.9

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
     id "com.github.breadmoirai.github-release" version "2.4.1"
     id "maven-publish"
 }

common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java

@@ -2,31 +2,28 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.events.GuiEventListener;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 @ApiStatus.Internal
 public class SelectionList extends ContainerObjectSelectionList<SelectionListEntry> {
-    public SelectionList(Minecraft minecraft, int width, int height, int y, int itemHeight) {
-        super(minecraft, width, height, y, itemHeight);
-        this.centerListVertically = false;
-    }
+	public SelectionList(Minecraft minecraft, int width, int height, int y, int itemHeight) {
+		super(minecraft, width, height, y, itemHeight);
+		this.centerListVertically = false;
+	}
 
-    @Override
-    public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-        super.renderWidget(graphics, mouseX, mouseY, delta);
-    }
+	@Override
+	public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+		super.renderWidget(graphics, mouseX, mouseY, delta);
+	}
 
-    @Override
-    protected int scrollBarX() {
-        return this.width - 7;
-    }
+	@Override
+	protected int scrollBarX() {
+		return this.width - 7;
+	}
 
-    @Override
-    public int getRowWidth() {
-        return 1000;
-    }
+	@Override
+	public int getRowWidth() {
+		return 1000;
+	}
 }

common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java

@@ -27,17 +27,17 @@ public SelectionListEntry(Component title, List<FormattedCharSequence> tooltip,
         this.widgets = widgets;
     }
 
-    @Override
-    public void render(GuiGraphics graphics, int i, int y, int x, int width, int height, int mouseX, int mouseY, boolean hovered, float delta) {
-        for (AbstractWidget widget : this.widgets) {
-            widget.setY(y);
-            widget.render(graphics, mouseX, mouseY, delta);
-        }
+	@Override
+	public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovered, float delta) {
+		for (AbstractWidget widget : this.widgets) {
+			widget.setY(this.getY());
+			widget.render(guiGraphics, mouseX, mouseY, delta);
+		}
 
-        this.renderTitle(graphics, y, 12, x + width / 2 - 10);
-    }
-    
-    // Mainly taken from AbstractWidget
+		this.renderTitle(guiGraphics, this.getY(), 12, this.getX() + this.getWidth() / 2 - 10);
+	}
+
+	// Mainly taken from AbstractWidget
     private void renderTitle(GuiGraphics graphics, int minY, int minX, int maxX) {
         int textWidth = Minecraft.getInstance().font.width(this.title);
         int y = minY + Minecraft.getInstance().font.lineHeight / 2 + 1;

common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java

@@ -5,12 +5,9 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -21,112 +18,43 @@ public class WidgetList extends ContainerObjectSelectionList<WidgetList.Entry> {
 	public static final int PADDING = 4;
 
 	public WidgetList(Minecraft minecraft, int width, int height, int y) {
-		super(minecraft, width, height, y, 1);
+		super(minecraft, width, height, y, 20);
 		this.centerListVertically = false;
-		this.headerHeight = PADDING;
 	}
 
 	public void addWidgetGroup(List<AbstractWidget> widgets) {
 		this.addEntry(new Entry(widgets));
 	}
 
 	public void updateWidgetGroup(int index, List<AbstractWidget> widgets) {
-		this.children().set(index, new Entry(widgets));
+		this.children().get(index).updateChildren(widgets);
+		this.swap(index, index); // Force reposition of entries
 	}
 
 	@Override
 	public int getRowWidth() {
 		return this.width;
 	}
 
-	@Nullable
-	public Entry getRealEntryAtPosition(double mouseX, double mouseY) {
-		int halfRowWidth = this.getRowWidth() / 2;
-		int centerX = this.getX() + this.width / 2;
-		int left = centerX - halfRowWidth;
-		int right = centerX + halfRowWidth;
-		int m = Mth.floor(mouseY - (double) this.getY()) - this.headerHeight + (int) this.scrollAmount() - 4;
-
-		if (mouseX < left || mouseX > right || m < 0) {
-			return null;
-		}
-
-		int height = 0;
-
-		for (int idx = 0; idx < this.getItemCount(); idx++) {
-			Entry entry = this.getEntry(idx);
-			height += entry.getHeight() + PADDING;
-			if (m < height) {
-				return entry;
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	protected void renderListItems(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
-		for (int itemIdx = 0; itemIdx < this.getItemCount(); ++itemIdx) {
-			int top = this.getRowTop(itemIdx);
-			int bottom = this.getRowBottom(itemIdx);
-			if (bottom >= this.getY() && top <= this.getBottom()) {
-				this.renderItem(graphics, mouseX, mouseY, partialTick, itemIdx, this.getRowLeft(), top, this.getRowWidth(), this.getEntry(itemIdx).getHeight());
-			}
-		}
-	}
-
-	@Override
-	protected int contentHeight() {
-		int itemsHeight = 0;
-
-		for (int i = 0; i < this.getItemCount(); i++) {
-			itemsHeight += this.getEntry(i).getHeight() + PADDING;
-		}
-
-		return itemsHeight + this.headerHeight;
-	}
-
-	@Override
-	public int getRowTop(int index) {
-		int itemsHeight = 0;
-
-		for (int i = 0; i < index; i++) {
-			itemsHeight += this.getEntry(i).getHeight() + PADDING;
-		}
-
-		return this.getY() - (int) this.scrollAmount() + itemsHeight + this.headerHeight;
-	}
-
-	@Override
-	public int getRowBottom(int index) {
-		return this.getRowTop(index) + this.getEntry(index).getHeight();
-	}
-
-	@Override
-	protected double scrollRate() {
-		return 10;
-	}
-
 	@Override
 	protected int scrollBarX() {
 		return this.getX() + this.width - 6;
 	}
 
 	public static class Entry extends ContainerObjectSelectionList.Entry<Entry> {
-		private final List<AbstractWidget> children;
-		private final List<Integer> childYs;
+		private List<AbstractWidget> children;
+		private List<Integer> childYs;
 
 		private Entry(List<AbstractWidget> list) {
-			this.children = ImmutableList.copyOf(list);
-			this.childYs = this.children.stream().map(AbstractWidget::getY).toList();
+			this.updateChildren(list);
 		}
 
 		@Override
-		public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) {
+		public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovered, float partialTick) {
 			for (int i = 0; i < this.children.size(); i++) {
 				AbstractWidget widget = this.children.get(i);
 				int relativeY = this.childYs.get(i);
-				widget.setY(top + relativeY);
+				widget.setY(PADDING + this.getY() + relativeY);
 				widget.render(guiGraphics, mouseX, mouseY, partialTick);
 			}
 		}
@@ -140,7 +68,13 @@ public int getHeight() {
 				maxY = Math.max(relativeY + widget.getHeight(), maxY);
 			}
 
-			return maxY;
+			return maxY + PADDING;
+		}
+
+		private void updateChildren(List<AbstractWidget> children) {
+			System.out.println("Updating children " + this.children + " with " + children);
+			this.children = ImmutableList.copyOf(children);
+			this.childYs = this.children.stream().map(AbstractWidget::getY).toList();
 		}
 
 		@Override

common/src/client/java/io/github/jamalam360/jamlib/client/mixin/AbstractSelectionListMixin.java

@@ -9,14 +9,14 @@
 
 @Mixin(AbstractSelectionList.class)
 public class AbstractSelectionListMixin {
-	@Inject(
-			method = "getEntryAtPosition",
-			at = @At("HEAD"),
-			cancellable = true
-	)
-	private void jamlib$modifyGetEntryAtPositionForWidgetList(double mouseX, double mouseY, CallbackInfoReturnable<Object> cir) {
-		if ((Object) this instanceof WidgetList widgetList) {
-			cir.setReturnValue(widgetList.getRealEntryAtPosition(mouseX, mouseY));
-		}
-	}
+//	@Inject(
+//			method = "getEntryAtPosition",
+//			at = @At("HEAD"),
+//			cancellable = true
+//	)
+//	private void jamlib$modifyGetEntryAtPositionForWidgetList(double mouseX, double mouseY, CallbackInfoReturnable<Object> cir) {
+//		if ((Object) this instanceof WidgetList widgetList) {
+//			cir.setReturnValue(widgetList.getRealEntryAtPosition(mouseX, mouseY));
+//		}
+//	}
 }

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
-version=1.3.5+1.21.8
-minecraft_version=1.21.8
+version=1.3.5+1.21.9
+minecraft_version=1.21.9
 
-additional_minecraft_versions=1.21.6,1.21.7
-minimum_minecraft_version=1.21.6
-minimum_architectury_api_version=17.0.6
-minimum_fabric_api_version=0.128.2+1.21.6
+additional_minecraft_versions=
+minimum_minecraft_version=1.21.9
+minimum_architectury_api_version=18.0.3
+minimum_fabric_api_version=0.134.0+1.21.9
 
 branch=main
 group=io.github.jamalam360

libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
 # https://modrinth.com/mod/architectury-api/versions
-architectury = "17.0.8"
+architectury = "18.0.3"
 
 # https://parchmentmc.org/docs/getting-started
 parchment-minecraft = "1.21.8"
 parchment = "2025.09.14"
 
 # https://projects.neoforged.net/neoforged/neoforge
-neoforge = "21.8.47"
+neoforge = "21.9.13-beta"
 
 # https://fabricmc.net/develop
 fabric-loader = "0.17.2"
-fabric-api = "0.133.4+1.21.8"
+fabric-api = "0.134.0+1.21.9"
 
 # https://modrinth.com/mod/modmenu/versions
-modmenu = "15.0.0"
+modmenu = "16.0.0-rc.1"
 
 # https://github.com/falkreon/Jankson/releases/latest
 jankson = "1.2.3"