Merge branch '1.21.3' into 1.21.1

# Conflicts:
#	gradle.properties

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.modrinth.minotaur' version '2.+'
 	id 'net.darkhax.curseforgegradle' version '1.1.+'
@@ -14,8 +14,8 @@ base {
 }
 
 repositories {
-	maven { url "https://maven.terraformersmc.com/releases/" }
+	maven { url = "https://maven.terraformersmc.com/releases/" }
-	maven { url "https://maven.isxander.dev/releases" }
+	maven { url = "https://maven.isxander.dev/releases" }
 }
 
 loom {
@@ -33,7 +33,7 @@ dependencies {
 }
 
 processResources {
-	filteringCharset "UTF-8"
+	filteringCharset = "UTF-8"
 
 	var replaceProperties = [
 			version                : project.version,

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-min_minecraft_version=1.21.4
+min_minecraft_version=1.21
-minecraft_version=1.21.4
+minecraft_version=1.21.1
-yarn_mappings=1.21.4+build.8
+yarn_mappings=1.21.1+build.3
-loader_version=0.16.10
+loader_version=0.16.9
 
 # Mod Properties
-mod_version=1.2.3+1.21.4
+mod_version=1.2.3+1.21-1.21.1
 maven_group=one.oth3r
 file_name=sit!
 
 # Dependencies
-fabric_version=0.116.1+1.21.4
+fabric_version=0.109.0+1.21.1
-modmenu_version=13.0.0-beta.1
+modmenu_version=11.0.0-beta.1

src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java

@@ -4,7 +4,6 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
@@ -21,10 +20,12 @@ public class ClickableImageWidget extends ButtonWidget {
 
     @Override
     protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+        context.setShaderColor(1.0f, 1.0f, 1.0f, this.alpha);
         RenderSystem.enableBlend();
         RenderSystem.enableDepthTest();
-        context.drawTexture(RenderLayer::getGuiTextured, image,
+        context.drawTexture(image,
                 this.getX(), this.getY(), 0.0f, 0.0f, this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight());
+        context.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
     }
 
 }

src/main/java/one/oth3r/sit/screen/ConfigScreen.java

@@ -5,10 +5,8 @@ import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.ColorHelper;
 import one.oth3r.sit.file.FileData;
 import one.oth3r.sit.utl.Data;
 
@@ -73,8 +71,8 @@ public class ConfigScreen extends Screen {
     private void renderBanner(DrawContext context, int x, int y, float alpha) {
         RenderSystem.enableBlend();
 
-        context.drawTexture(RenderLayer::getGuiTextured,Identifier.of(Data.MOD_ID, "textures/gui/banner.png"),
+        context.drawTexture(Identifier.of(Data.MOD_ID, "textures/gui/banner.png"),
-                x, y, 0.0f, 0.0f, 128, 72, 128, 72, ColorHelper.getWhite(alpha));
+                x, y, 0.0f, 0.0f, 128, 72, 128, 72);
 
         RenderSystem.disableBlend();
     }

src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java

@@ -4,7 +4,6 @@ import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -30,7 +29,7 @@ public class TextureButtonWidget extends ButtonWidget {
         super.renderWidget(context, mouseX, mouseY, delta);
         int x = this.getX() + this.getWidth() / 2 - this.textureWidth / 2;
         int y = this.getY() + this.getHeight() / 2 - this.textureHeight / 2;
-        context.drawGuiTexture(RenderLayer::getGuiTextured, this.texture, x, y, this.textureWidth, this.textureHeight);
+        context.drawGuiTexture(this.texture, x, y, this.textureWidth, this.textureHeight);
     }
 
     @Override

src/main/java/one/oth3r/sit/utl/Utl.java

@@ -14,7 +14,6 @@ import net.minecraft.entity.decoration.DisplayEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.consume.UseAction;
 import net.minecraft.registry.Registries;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;