Update to 21w20a.

build.gradle

@@ -10,7 +10,7 @@ import net.fabricmc.loom.task.RemapJarTask
 
 group = project.maven_group
 version = "${project.mod_version}+${getMCVersionString()}"
-archivesBaseName = project.archives_base_name + "-fabric"
+archivesBaseName = project.archives_base_name
 
 // This field defines the Java version your mod target.
 def targetJavaVersion = 16
@@ -37,7 +37,10 @@ repositories {
         name = 'AperLambda'
         url = 'https://aperlambda.github.io/maven'
     }
-    maven { url = "https://jitpack.io" }
+    maven {
+        name 'Gegy'
+        url 'https://maven.gegy.dev'
+    }
     maven {
         name = "grondag"
         url = "https://grondag-repo.appspot.com"
@@ -59,10 +62,10 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
-    modImplementation "com.github.lambdaurora:spruceui:${project.spruceui_version}"
-    include "com.github.lambdaurora:spruceui:${project.spruceui_version}"
+    modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
+    include "dev.lambdaurora:spruceui:${project.spruceui_version}"
 
     modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") {
         transitive = false

gradle.properties

@@ -3,9 +3,11 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=21w19a
-yarn_mappings=21w19a+build.1
+minecraft_version=21w20a
+yarn_mappings=21w20a+build.19
 loader_version=0.11.3
+# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+fabric_api_version=0.34.5+1.17
 
 # Mod Properties
 mod_version = 2.0.0
@@ -14,6 +16,5 @@ archives_base_name = lambdynamiclights
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.34.4+1.17
-spruceui_version=3.0.4-21w14a
+spruceui_version=3.1.0+21w20a
 modmenu_version=2.0.0-beta.4

src/main/java/dev/lambdaurora/lambdynlights/gui/DynamicLightsOptionsOption.java

@@ -11,8 +11,8 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.option.Option;
 import net.minecraft.text.Text;
@@ -31,7 +31,7 @@ public DynamicLightsOptionsOption(Screen parent) {
     }
 
     @Override
-    public AbstractButtonWidget createButton(GameOptions options, int x, int y, int width) {
+    public ClickableWidget createButton(GameOptions options, int x, int y, int width) {
         return new ButtonWidget(x, y, width, 20, this.text, btn -> MinecraftClient.getInstance().openScreen(new SettingsScreen(this.parent)));
     }
 }

src/main/java/dev/lambdaurora/lambdynlights/gui/SettingsScreen.java

@@ -14,6 +14,7 @@
 import dev.lambdaurora.lambdynlights.LambDynLights;
 import dev.lambdaurora.lambdynlights.LambDynLightsCompat;
 import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.SpruceTexts;
 import dev.lambdaurora.spruceui.option.*;
 import dev.lambdaurora.spruceui.screen.SpruceScreen;
 import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
@@ -100,10 +101,11 @@ protected void init() {
         this.list.addOptionEntry(this.entitiesOption, this.blockEntitiesOption);
         this.list.addOptionEntry(this.waterSensitiveOption, null);
         this.list.addOptionEntry(this.creeperLightingOption, this.tntLightingOption);
-        this.addChild(list);
+        this.addDrawableChild(list);
 
-        this.addChild(this.resetOption.createWidget(Position.of(this, this.width / 2 - 155, this.height - 29), 150));
-        this.addChild(new SpruceButtonWidget(Position.of(this, this.width / 2 - 155 + 160, this.height - 29), 150, 20, new TranslatableText("gui.done"),
+        this.addDrawableChild(this.resetOption.createWidget(Position.of(this, this.width / 2 - 155, this.height - 29), 150));
+        this.addDrawableChild(new SpruceButtonWidget(Position.of(this, this.width / 2 - 155 + 160, this.height - 29), 150, 20,
+                SpruceTexts.GUI_DONE,
                 (btn) -> this.client.openScreen(this.parent)));
     }
 

src/main/java/dev/lambdaurora/lambdynlights/mixin/VideoOptionsScreenMixin.java

@@ -29,9 +29,6 @@
 
 @Mixin(VideoOptionsScreen.class)
 public class VideoOptionsScreenMixin extends GameOptionsScreen {
-    @Shadow
-    private ButtonListWidget list;
-
     @Unique
     private Option lambdynlights$option;
 

src/main/resources/fabric.mod.json

@@ -30,8 +30,8 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": ">=0.34.4",
-    "minecraft": ">=1.17-alpha.21.19.a",
-    "spruceui": ">=3.0.4",
+    "minecraft": ">=1.17-alpha.21.20.a",
+    "spruceui": ">=3.1.0",
     "java": ">=16"
   },
   "recommends": {