Backport The Rebirth Update: Part 2 to Minecraft 1.21.1

This is pending the readdition of the "Unbind Conflicting Key" feature

Author: EnnuiL

build-logic/src/main/kotlin/mod_conventions_common.gradle.kts

@@ -40,10 +40,10 @@ repositories {
 	}
 	exclusiveContent {
 		forRepository {
-			maven("https://maven.caffeinemc.net/releases")
+			maven("https://maven.parchmentmc.org")
 		}
 		filter {
-			includeGroup("net.caffeinemc")
+			includeGroup("org.parchmentmc.data")
 		}
 	}
 	mavenCentral()

gradle/libs.versions.toml

@@ -1,38 +1,40 @@
 [versions]
-minecraft = "1.21.11"
-minecraft_unobfuscated = "1.21.11_unobfuscated"
+minecraft = "1.21.1"
+parchment = "2024.11.17"
 
 fabric_loom = "1.15.1"
 fabric_loader = "0.18.4"
 moddevgradle = "2.0.139"
-neoforge = "21.11.36-beta"
+neoforge = "21.1.218"
 
-fabric_api = "0.141.1+1.21.11"
+fabric_api = "0.116.7+1.21.1"
 wrench_wrapper = "0.8.1"
 
-modmenu = "17.0.0-beta.2"
-sodium = "0.8.2+mc1.21.11"
+modmenu = "11.0.3"
+trinkets = "3.10.0"
+cca = "6.1.3"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
-minecraft_unobfuscated = { module = "com.mojang:minecraft", version.ref = "minecraft_unobfuscated" }
 fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
+parchment = { module = "org.parchmentmc.data:parchment-1.21.1", version.ref = "parchment" }
 
 fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 wrench_wrapper_api_fabric = { module = "page.langeweile.wrench_wrapper:api_fabric", version.ref = "wrench_wrapper" }
 wrench_wrapper_api_neoforge = { module = "page.langeweile.wrench_wrapper:api_neoforge", version.ref = "wrench_wrapper" }
 wrench_wrapper_impl = { module = "page.langeweile.wrench_wrapper:impl", version.ref = "wrench_wrapper" }
 
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
-sodium_fabric = { module = "net.caffeinemc:sodium-fabric-api", version.ref = "sodium" }
-sodium_neoforge = { module = "net.caffeinemc:sodium-neoforge-api", version.ref = "sodium" }
+trinkets = { module = "dev.emi:trinkets", version.ref = "trinkets" }
+cca_base = { module = "org.ladysnake.cardinal-components-api:cardinal-components-base", version.ref = "cca" }
+cca_entity = { module = "org.ladysnake.cardinal-components-api:cardinal-components-entity", version.ref = "cca" }
 
 # If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
 [bundles]
 wrench_wrapper_fabric = ["wrench_wrapper_api_fabric", "wrench_wrapper_impl"]
 wrench_wrapper_neoforge = ["wrench_wrapper_api_neoforge", "wrench_wrapper_impl"]
+trinkets = ["trinkets", "cca_base", "cca_entity"]
 
 [plugins]
-fabric_loom = { id = "net.fabricmc.fabric-loom", version.ref = "fabric_loom" }
 fabric_loom-remap = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric_loom" }
 moddevgradle = { id = "net.neoforged.moddev", version.ref = "moddevgradle" }

mod_common/build.gradle.kts

@@ -1,16 +1,20 @@
 plugins {
 	id("mod_conventions_common")
-	alias(libs.plugins.fabric.loom)
+	alias(libs.plugins.fabric.loom.remap)
 }
 
 base.archivesName = "ok_zoomer-common"
 
 // All the dependencies are declared at gradle/libs.version.toml and referenced with "libs.<id>"
 // See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work.
 dependencies {
-	minecraft(libs.minecraft.unobfuscated)
-	compileOnly(libs.fabric.loader)
-	compileOnly(libs.wrench.wrapper.api.fabric)
+	minecraft(libs.minecraft)
+	mappings(loom.layered {
+		this.officialMojangMappings()
+		this.parchment(libs.parchment)
+	})
+	modCompileOnly(libs.fabric.loader)
+	modCompileOnly(libs.wrench.wrapper.api.fabric)
 }
 
 loom {

mod_common/src/main/java/page/langeweile/ok_zoomer/config/OkZoomerConfig.java

@@ -212,10 +212,6 @@ public static final class TweaksConfig extends Section  {
 		@Comment("a")
 		public final TrackedValue<Boolean> numericSliders = this.value(true);
 
-		@WidgetSize(Size.HALF)
-		@Comment("Adds a button to open Ok Zoomer settings next to the zoom key bind.")
-		public final TrackedValue<Boolean> showSettingsOnKey = this.value(true);
-
 		@WidgetSize(Size.HALF)
 		@Comment("Displays debug information for exponential zoom scrolling. Currently it may help with configuring the zoom scrolling.")
 		public final TrackedValue<Boolean> debugScrolling = this.value(false);

mod_common/src/main/java/page/langeweile/ok_zoomer/config/OkZoomerConfigManager.java

@@ -1,7 +1,7 @@
 package page.langeweile.ok_zoomer.config;
 
 import it.unimi.dsi.fastutil.floats.FloatUnaryOperator;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 import page.langeweile.ok_zoomer.utils.ModUtils;
 import page.langeweile.ok_zoomer.zoom.Zoom;
@@ -45,7 +45,7 @@ public static void configureZoomInstance() {
 		// TODO - Restore the "Use Spyglass Texture" option as a "Use Custom Texture" option
 		// You won't do it without a nice placeholder texture though (that isn't Michael lmfao)
 		var overlayTextureId = CONFIG.appearance.zoomOverlay.value() == ConfigEnums.ZoomOverlays.SPYGLASS
-			? Identifier.withDefaultNamespace("textures/misc/spyglass_scope.png")
+			? ResourceLocation.withDefaultNamespace("textures/misc/spyglass_scope.png")
 			: ModUtils.id("textures/misc/zoom_overlay.png");
 
 		Zoom.setZoomOverlay(

mod_common/src/main/java/page/langeweile/ok_zoomer/config/screen/ConfigTextUtils.java

@@ -1,7 +1,7 @@
 package page.langeweile.ok_zoomer.config.screen;
 
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import org.quiltmc.config.api.Config;
 import org.quiltmc.config.api.annotations.SerializedNameConvention;
 import org.quiltmc.config.api.metadata.NamingScheme;
@@ -19,7 +19,7 @@ public ConfigTextUtils(Config config) {
 		this.scheme = this.config.metadata(SerializedNameConvention.TYPE);
 	}
 
-	public static Component getConfigTitle(Identifier configId) {
+	public static Component getConfigTitle(ResourceLocation configId) {
 		return Component.translatable("config." + configId.getNamespace() + ".title");
 	}
 

mod_common/src/main/java/page/langeweile/ok_zoomer/config/screen/OkZoomerConfigScreen.java

@@ -8,7 +8,7 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.CommonColors;
 import org.quiltmc.config.api.Configs;
 import org.quiltmc.config.api.Constraint;
@@ -28,7 +28,7 @@
 
 // TODO - You may have dropped your silly data-driven config screen idea, but you still want to streamline the config screen. Do Config v2!
 public class OkZoomerConfigScreen extends Screen {
-	private final Identifier configId;
+	private final ResourceLocation configId;
 	private final Screen parent;
 	private ConfigTextUtils configTextUtils;
 	private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this);
@@ -53,12 +53,12 @@ protected void init() {
 		this.selectionList = new OkZoomerSelectionList(this.minecraft, this.width, this.height - 64, 32, this);
 
 		this.selectionList.addCategory(Component.translatable("config.ok_zoomer.presets"));
-		var presetButton = CycleButton.builder(
-			value -> Component.translatable(String.format("config.ok_zoomer.presets.preset.%s", value.toString().toLowerCase(Locale.ROOT))),
-				ConfigEnums.ZoomPresets.CAMERA
+		var presetButton = CycleButton.<ConfigEnums.ZoomPresets>builder(
+			value -> Component.translatable(String.format("config.ok_zoomer.presets.preset.%s", value.toString().toLowerCase(Locale.ROOT)))
 			)
 			.withValues(ConfigEnums.ZoomPresets.values())
 			.withTooltip(value -> Tooltip.create(Component.translatable(String.format("config.ok_zoomer.presets.preset.%s.tooltip", value.toString().toLowerCase(Locale.ROOT)))))
+			.withInitialValue(ConfigEnums.ZoomPresets.CAMERA)
 			.create(0, 0, 150, 20,
 				Component.translatable("config.ok_zoomer.presets.preset"));
 		var resetButton = Button.builder(
@@ -192,12 +192,12 @@ protected void init() {
 								this.addOptionToList(button, size);
 							}
 						} else if (trackedValue.value() instanceof ConfigEnums.ConfigEnum configEnum) {
-							var button = CycleButton.builder(
-								value -> this.configTextUtils.getEnumOptionText(trackedValue, value),
-									(ConfigEnums.ConfigEnum) this.newValues.get(trackie)
+							var button = CycleButton.<ConfigEnums.ConfigEnum>builder(
+								value -> this.configTextUtils.getEnumOptionText(trackedValue, value)
 								)
 								.withValues((ConfigEnums.ConfigEnum[]) ((Enum<?>) configEnum).getDeclaringClass().getEnumConstants())
 								.withTooltip(value -> Tooltip.create(this.configTextUtils.getEnumOptionTextTooltip(trackedValue, value)))
+								.withInitialValue((ConfigEnums.ConfigEnum) this.newValues.get(trackie))
 								.create(
 									0, 0, 150, 20,
 									this.configTextUtils.getOptionText(trackedValue),
@@ -264,7 +264,7 @@ public void removed() {
 	}
 
 	private void refresh() {
-		var scrollAmount = this.selectionList.scrollAmount();
+		var scrollAmount = this.selectionList.getScrollAmount();
 		this.rebuildWidgets();
 		this.selectionList.setScrollAmount(scrollAmount);
 	}

mod_common/src/main/java/page/langeweile/ok_zoomer/config/screen/components/OkZoomerFloatSlider.java

@@ -43,10 +43,10 @@ public OkZoomerFloatSlider(TrackedValue<Float> trackedValue, Component optionTex
 
 	@Override
 	protected void updateMessage() {
-		this.message = CommonComponents.optionNameValue(
+		this.setMessage(CommonComponents.optionNameValue(
 			optionText,
 			Component.literal(String.valueOf(this.internalValue))
-		);
+		));
 	}
 
 	@Override

mod_common/src/main/java/page/langeweile/ok_zoomer/config/screen/components/OkZoomerIntegerSlider.java

@@ -43,10 +43,10 @@ public OkZoomerIntegerSlider(TrackedValue<Integer> trackedValue, Component optio
 
 	@Override
 	protected void updateMessage() {
-		this.message = CommonComponents.optionNameValue(
+		this.setMessage(CommonComponents.optionNameValue(
 			optionText,
 			Component.literal(String.valueOf(this.internalValue))
-		);
+		));
 	}
 
 	@Override

mod_common/src/main/java/page/langeweile/ok_zoomer/config/screen/components/OkZoomerSelectionList.java

@@ -27,9 +27,7 @@ public int getRowWidth() {
 	}
 
 	public void addCategory(Component component) {
-		int baseline = 9;
-		int padding = this.children().isEmpty() ? 0 : baseline * 2;
-		this.addEntry(new CategoryEntry(component, this.screen, padding), padding + baseline + 4);
+		this.addEntry(new CategoryEntry(component, this.screen));
 	}
 
 	public void addButton(AbstractWidget button) {
@@ -48,19 +46,17 @@ public abstract static class Entry extends ContainerObjectSelectionList.Entry<En
 		}
 	}
 
-	static class CategoryEntry extends Entry {
-		private final int paddingTop;
+	class CategoryEntry extends Entry {
 		private final StringWidget widget;
 
-		private CategoryEntry(Component title, Screen screen, int paddingTop) {
+		private CategoryEntry(Component title, Screen screen) {
 			super(screen);
-			this.widget = new StringWidget(title, screen.getFont());
-			this.paddingTop = paddingTop;
+			this.widget = new StringWidget(title, OkZoomerSelectionList.this.minecraft.font);
 		}
 
 		@Override
-		public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean isHovering, float partialTick) {
-			this.widget.setPosition(this.screen.width / 2 - 155, this.getContentY() + this.paddingTop);
+		public void render(GuiGraphics graphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) {
+			this.widget.setPosition(this.screen.width / 2 - 155, top + 14);
 			this.widget.render(graphics, mouseX, mouseY, partialTick);
 		}
 
@@ -96,9 +92,9 @@ public ButtonEntry(AbstractWidget leftButton, AbstractWidget rightButton, Screen
 		}
 
 		@Override
-		public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean isHovering, float partialTick) {
+		public void render(GuiGraphics graphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) {
 			int x = this.screen.width / 2 - 155;
-			int y = this.getContentY();
+			int y = top;
 
 			this.leftButton.setPosition(x, y + 2);
 			this.leftButton.render(graphics, mouseX, mouseY, partialTick);
@@ -109,11 +105,6 @@ public void renderContent(GuiGraphics graphics, int mouseX, int mouseY, boolean
 			}
 		}
 
-		@Override
-		public int getHeight() {
-			return (rightButton != null ? Math.max(leftButton.getHeight(), rightButton.getHeight()) : leftButton.getHeight()) + 4;
-		}
-
 		@Override
 		public @NotNull List<? extends GuiEventListener> children() {
 			return this.buttons;