Update to 1.21.2

build.gradle.kts

@@ -1,3 +1,5 @@
 plugins {
-  id("roundalib") version "0.7.0-SNAPSHOT"
+  id("fabric-loom") version "1.9-SNAPSHOT"
+  id("com.gradleup.shadow") version "9.0.0-beta2"
+  id("roundalib") version "0.9.0-SNAPSHOT"
 }

gradle.properties

@@ -6,10 +6,10 @@ org.gradle.parallel=true
 group_id=me.roundaround
 mod_id=armorstands
 mod_version=2.0.0
-minecraft_version=1.21
-yarn_mappings=build.9
-loader_version=0.15.11
-fabric_version=0.102.0
-roundalib_version=2.0.0
-mod_menu_version=11.0.1
+minecraft_version=1.21.2
+yarn_mappings=build.1
+loader_version=0.16.9
+fabric_version=0.106.1
+roundalib_version=2.3.0
+mod_menu_version=12.0.0-beta.1
 dev_login_version=3.5

gradle/wrapper/gradle-wrapper.properties

@@ -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.11-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/me/roundaround/armorstands/client/gui/screen/AbstractArmorStandScreen.java

@@ -84,7 +84,7 @@ public boolean shouldPassEvents() {
   public void init() {
     this.populateLayout();
     this.collectElements();
-    this.initTabNavigation();
+    this.refreshWidgetPositions();
   }
 
   protected MinecraftClient getClient() {
@@ -179,7 +179,7 @@ protected void collectElements() {
   }
 
   @Override
-  protected void initTabNavigation() {
+  protected void refreshWidgetPositions() {
     this.layout.refreshPositions();
   }
 

src/main/java/me/roundaround/armorstands/client/gui/screen/ArmorStandInventoryScreen.java

@@ -1,7 +1,6 @@
 package me.roundaround.armorstands.client.gui.screen;
 
 import com.google.common.collect.ImmutableList;
-import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.datafixers.util.Pair;
 import me.roundaround.armorstands.ArmorStandsMod;
 import me.roundaround.armorstands.client.network.ClientNetworking;
@@ -11,6 +10,7 @@
 import me.roundaround.roundalib.client.gui.widget.ToggleWidget;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.util.Identifier;
@@ -62,10 +62,10 @@ private boolean getFlagValue(ArmorStandFlag flag) {
   }
 
   @Override
-  protected void initTabNavigation() {
+  protected void refreshWidgetPositions() {
     this.x = (this.width - BACKGROUND_WIDTH) / 2;
     this.y = (this.height - BACKGROUND_HEIGHT) / 2;
-    super.initTabNavigation();
+    super.refreshWidgetPositions();
   }
 
   @Override
@@ -78,9 +78,9 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
 
   @Override
   protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) {
-    RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
-
-    context.drawTexture(CUSTOM_TEXTURE, this.x, this.y, 0, 0, BACKGROUND_WIDTH, BACKGROUND_HEIGHT);
+    context.drawTexture(RenderLayer::getGuiTextured, CUSTOM_TEXTURE, this.x, this.y, 0, 0, BACKGROUND_WIDTH,
+        BACKGROUND_HEIGHT, 256, 256
+    );
 
     ImmutableList<Pair<Slot, EquipmentSlot>> armorSlots = this.handler.getArmorSlots();
     for (int index = 0; index < armorSlots.size(); index++) {

src/main/java/me/roundaround/armorstands/client/gui/screen/ArmorStandUtilitiesScreen.java

@@ -110,10 +110,8 @@ private ToggleWidget createToggleWidget(ArmorStandFlag flag) {
         .setHeight(BUTTON_HEIGHT)
         .labelBgColor(BACKGROUND_COLOR)
         .build();
-    this.subscriptions.add(this.values.get(flag).subscribe(
-        (value) -> widget.setValue(value ^ flag.invertControl()),
-        Observable.SubscribeOptions.builder().withHardReference().build()
-    ));
+    this.subscriptions.add(this.values.get(flag)
+        .subscribe((value) -> widget.setValue(value ^ flag.invertControl()), Observable.SubscribeOptions.create()));
     return widget;
   }
 

src/main/java/me/roundaround/armorstands/network/ArmorStandFlag.java

@@ -65,7 +65,7 @@ public boolean getValue(ArmorStandEntity armorStand) {
     ArmorStandEntityAccessor accessor = (ArmorStandEntityAccessor) armorStand;
 
     return switch (this) {
-      case HIDE_BASE_PLATE -> armorStand.shouldHideBasePlate();
+      case HIDE_BASE_PLATE -> !armorStand.shouldShowBasePlate();
       case SHOW_ARMS -> armorStand.shouldShowArms();
       case SMALL -> armorStand.isSmall();
       case NO_GRAVITY -> armorStand.hasNoGravity();

src/main/java/me/roundaround/armorstands/screen/ArmorStandScreenHandler.java

@@ -265,6 +265,6 @@ private boolean tryTransferToOffHand(ItemStack stack) {
   }
 
   public static boolean isSlotDisabled(ArmorStandEntity armorStand, EquipmentSlot slot) {
-    return (((ArmorStandEntityAccessor) armorStand).getDisabledSlots() & 1 << slot.getArmorStandSlotId()) != 0;
+    return (((ArmorStandEntityAccessor) armorStand).getDisabledSlots() & 1 << slot.getEntitySlotId()) != 0;
   }
 }

src/main/java/me/roundaround/armorstands/util/actions/ScaleAction.java

@@ -74,7 +74,7 @@ public static void setScale(ArmorStandEntity armorStand, float scale, boolean ro
       }
     }
 
-    EntityAttributeInstance attribute = armorStand.getAttributes().getCustomInstance(EntityAttributes.GENERIC_SCALE);
+    EntityAttributeInstance attribute = armorStand.getAttributes().getCustomInstance(EntityAttributes.SCALE);
     if (attribute != null) {
       attribute.setBaseValue(target);
     }

src/main/resources/fabric.mod.json

@@ -40,7 +40,6 @@
     }
   },
   "depends": {
-    "fabricloader": ">=0.15.11",
     "fabric-api": "*",
     "minecraft": "1.21.*"
   }