1.21.4 porting (#802)

* WIP

* Better FIXME note.

* port to rc.2

* port to rc.3

- Port to 1.21.4

Author: sakura-ryoko

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 }
 
 apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.7/ferry.gradle'

gradle.properties

@@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx1G
 maven_group=com.terraformersmc
 archive_name=modmenu
 
-minecraft_version=1.21.3
-yarn_mappings=1.21.3+build.2
+minecraft_version=1.21.4-rc3
+yarn_mappings=1.21.4-rc3+build.3
 loader_version=0.16.9
-fabric_version=0.107.0+1.21.3
-text_placeholder_api_version=2.5.0+1.21.2
+fabric_version=0.110.3+1.21.4
+text_placeholder_api_version=2.5.1+1.21.3
 quilt_loader_version=0.26.4
 
 # Project Metadata
@@ -21,14 +21,14 @@ default_release_type=stable
 # Modrinth Metadata
 modrinth_slug=modmenu
 modrinth_id=mOgUt4GM
-modrinth_game_versions=1.21.2-pre1, 1.21.2-pre2, 1.21.2-pre3, 1.21.2-pre4, 1.21.2-pre5, 1.21.2-rc1, 1.21.2-rc1, 1.21.2, 1.21.3
+modrinth_game_versions=1.21.4-rc3, 1.21.4
 modrinth_mod_loaders=fabric, quilt
 modrinth_required_dependencies=fabric-api, placeholder-api
 
 # CurseForge Metadata
 curseforge_slug=modmenu
 curseforge_id=308702
-curseforge_game_versions=1.21.2, 1.21.3, Fabric, Quilt
+curseforge_game_versions=1.21.4, Fabric, Quilt
 curseforge_required_dependencies=fabric-api, text-placeholder-api
 curseforge_optional_dependencies=
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -576,7 +576,7 @@ private boolean updateFiltersX(boolean onInit) {
 	}
 
 	@Override
-	public void filesDragged(List<Path> paths) {
+	public void onFilesDropped(List<Path> paths) {
 		Path modsDirectory = FabricLoader.getInstance().getGameDir().resolve("mods");
 
 		// Filter out none mods

gradlew

@@ -93,7 +93,7 @@ public void renderList(DrawContext DrawContext, int mouseX, int mouseY, float de
 		if (selectedEntry != lastSelected) {
 			lastSelected = selectedEntry;
 			clearEntries();
-			setScrollAmount(-Double.MAX_VALUE);
+			setScrollY(-Double.MAX_VALUE);
 			if (lastSelected != null) {
 				DescriptionEntry emptyEntry = new DescriptionEntry(OrderedText.EMPTY);
 				int wrapWidth = getRowWidth() - 5;
@@ -342,11 +342,11 @@ public void renderScrollBar(BufferBuilder bufferBuilder, Tessellator tessellator
 		BuiltBuffer builtBuffer;
 		int scrollbarStartX = this.getScrollbarX();
 		int scrollbarEndX = scrollbarStartX + 6;
-		int maxScroll = this.getMaxScroll();
+		int maxScroll = this.getMaxScrollY();
 		if (maxScroll > 0) {
-			int p = (int) ((float) ((this.getBottom() - this.getY()) * (this.getBottom() - this.getY())) / (float) this.getMaxPosition());
+			int p = (int) ((float) ((this.getBottom() - this.getY()) * (this.getBottom() - this.getY())) / (float) this.getContentsHeightWithPadding());
 			p = MathHelper.clamp(p, 32, this.getBottom() - this.getY() - 8);
-			int q = (int) this.getScrollAmount() * (this.getBottom() - this.getY() - p) / maxScroll + this.getY();
+			int q = (int) this.getScrollY() * (this.getBottom() - this.getY() - p) / maxScroll + this.getY();
 			if (q < this.getY()) {
 				q = this.getY();
 			}

gradlew.bat

@@ -30,7 +30,7 @@ public class ModListWidget extends AlwaysSelectedEntryListWidget<ModListEntry> i
 	private List<Mod> mods = null;
 	private final Set<Mod> addedMods = new HashSet<>();
 	private String selectedModId = null;
-	private boolean scrolling;
+	//private boolean scrolling;
 	private final FabricIconHandler iconHandler = new FabricIconHandler();
 
 	public ModListWidget(
@@ -50,15 +50,15 @@ public ModListWidget(
 	}
 
 	@Override
-	public void setScrollAmount(double amount) {
-		super.setScrollAmount(amount);
-		int denominator = Math.max(0, this.getMaxPosition() - (this.getBottom() - this.getY() - 4));
+	public void setScrollY(double amount) {
+		super.setScrollY(amount);
+		int denominator = Math.max(0, this.getContentsHeightWithPadding() - (this.getBottom() - this.getY() - 4));
 		if (denominator <= 0) {
 			parent.updateScrollPercent(0);
 		} else {
-			parent.updateScrollPercent(getScrollAmount() / Math.max(
+			parent.updateScrollPercent(getScrollY() / Math.max(
 				0,
-				this.getMaxPosition() - (this.getBottom() - this.getY() - 4)
+				this.getContentsHeightWithPadding() - (this.getBottom() - this.getY() - 4)
 			));
 		}
 	}
@@ -202,8 +202,8 @@ private void filter(String searchTerm, boolean refresh, boolean search) {
 			}
 		}
 
-		if (getScrollAmount() > Math.max(0, this.getMaxPosition() - (this.getBottom() - this.getY() - 4))) {
-			setScrollAmount(Math.max(0, this.getMaxPosition() - (this.getBottom() - this.getY() - 4)));
+		if (getScrollY() > Math.max(0, this.getContentsHeightWithPadding() - (this.getBottom() - this.getY() - 4))) {
+			setScrollY(Math.max(0, this.getContentsHeightWithPadding() - (this.getBottom() - this.getY() - 4)));
 		}
 	}
 
@@ -278,6 +278,8 @@ public void ensureVisible(ModListEntry entry) {
 		super.ensureVisible(entry);
 	}
 
+	// FIXME --> Was removed from super class (updateScrollingState / mouseClicked)
+	/*
 	@Override
 	protected void updateScrollingState(double double_1, double double_2, int int_1) {
 		super.updateScrollingState(double_1, double_2, int_1);
@@ -298,14 +300,15 @@ public boolean mouseClicked(double double_1, double double_2, int int_1) {
 					return true;
 				}
 			} else if (int_1 == 0 && this.clickedHeader((int) (double_1 - (double) (this.getX() + this.width / 2 - this.getRowWidth() / 2)),
-				(int) (double_2 - (double) this.getY()) + (int) this.getScrollAmount() - 4
+				(int) (double_2 - (double) this.getY()) + (int) this.getScrollY() - 4
 			)) {
 				return true;
 			}
 
 			return this.scrolling;
 		}
 	}
+	 */
 
 	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 		if (keyCode == GLFW.GLFW_KEY_UP || keyCode == GLFW.GLFW_KEY_DOWN) {
@@ -318,7 +321,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 	}
 
 	public final ModListEntry getEntryAtPos(double x, double y) {
-		int int_5 = MathHelper.floor(y - (double) this.getY()) - this.headerHeight + (int) this.getScrollAmount() - 4;
+		int int_5 = MathHelper.floor(y - (double) this.getY()) - this.headerHeight + (int) this.getScrollY() - 4;
 		int index = int_5 / this.itemHeight;
 		return x < (double) this.getScrollbarX() && x >= (double) getRowLeft() && x <= (double) (getRowLeft() + getRowWidth()) && index >= 0 && int_5 >= 0 && index < this.getEntryCount() ?
 			this.children().get(index) :
@@ -332,7 +335,7 @@ protected int getScrollbarX() {
 
 	@Override
 	public int getRowWidth() {
-		return this.width - (Math.max(0, this.getMaxPosition() - (this.getBottom() - this.getY() - 4)) > 0 ? 18 : 12);
+		return this.width - (Math.max(0, this.getContentsHeightWithPadding() - (this.getBottom() - this.getY() - 4)) > 0 ? 18 : 12);
 	}
 
 	@Override
@@ -353,8 +356,8 @@ public ModsScreen getParent() {
 	}
 
 	@Override
-	protected int getMaxPosition() {
-		return super.getMaxPosition() + 4;
+	protected int getContentsHeightWithPadding() {
+		return super.getContentsHeightWithPadding() + 4;
 	}
 
 	public int getDisplayedCountFor(Set<String> set) {

src/main/java/com/terraformersmc/modmenu/gui/ModsScreen.java

@@ -17,6 +17,7 @@ public JsonElement serialize(final Enum<?> src, final Type typeOfSrc, final Json
 		return new JsonPrimitive(src.name().toLowerCase());
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public Enum<?> deserialize(
 		final JsonElement json,