Merge branch '1.21.1' into 1.20.6

# 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.20.6
-minecraft_version=1.21.4
+minecraft_version=1.20.6
-yarn_mappings=1.21.4+build.8
+yarn_mappings=1.20.6+build.3
-loader_version=0.16.10
+loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.2.3+1.21.4
+mod_version=1.2.3+1.20.6
 maven_group=one.oth3r
 file_name=sit!
 
 # Dependencies
-fabric_version=0.116.1+1.21.4
+fabric_version=0.100.4+1.20.6
-modmenu_version=13.0.0-beta.1
+modmenu_version=10.0.0-beta.1

src/main/java/one/oth3r/sit/file/CustomBlock.java

@@ -96,7 +96,7 @@ public class CustomBlock {
         for (String tag : blockTags) {
             // substring to remove # and if needed, !
             // if there is a math for the NOT(!) tag, return false
-            if (tag.startsWith("!") && blockState.isIn(TagKey.of(Registries.BLOCK.getKey(), Identifier.of(tag.substring(2))))) return false;
+            if (tag.startsWith("!") && blockState.isIn(TagKey.of(Registries.BLOCK.getKey(), new Identifier(tag.substring(2))))) return false;
             // if there is a match, return true
             if (blockState.isIn(TagKey.of(Registries.BLOCK.getKey(), Identifier.tryParse(tag.substring(1))))) tagCheck = true;
         }

src/main/java/one/oth3r/sit/file/CustomItem.java

@@ -53,10 +53,10 @@ public class CustomItem {
             // if a NOT tag
             if (tag.startsWith("!")) {
                 // if there is a math for the NOT(!) tag, return false
-                if (itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), Identifier.of(tag.substring(2))))) return false;
+                if (itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), new Identifier(tag.substring(2))))) return false;
             }
             // else (normal tag), if there is a match, set tagCheck to true
-            else if (itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), Identifier.of(tag.substring(1))))) tagCheck = true;
+            else if (itemStack.isIn(TagKey.of(Registries.ITEM.getKey(), new Identifier(tag.substring(1))))) tagCheck = true;
         }
 
         // not returning true in the loop because there might be a (!) not tag that the item might fall into, after the item was already in another tag

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,15 +5,11 @@ 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;
 
-import java.net.URI;
-
 public class ConfigScreen extends Screen {
     protected final Screen parent;
 
@@ -38,13 +34,13 @@ public class ConfigScreen extends Screen {
 
 
         TextureButtonWidget issuesButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("sit!.gui.button.issues"),
-                        ConfirmLinkScreen.opening(this, URI.create("https://github.com/Oth3r/Sit/issues")), true)
+                        ConfirmLinkScreen.opening(this, "https://github.com/Oth3r/Sit/issues"), true)
                 .dimensions(20,20).texture(Identifier.of(Data.MOD_ID, "issues"), 15, 15).build());
         issuesButton.setPosition(this.width / 2 - 125, startY + 72 + 12);
 
 
         this.addDrawableChild(ButtonWidget.builder(Text.translatable("sit!.gui.button.website"),
-                ConfirmLinkScreen.opening(this, URI.create("https://modrinth.com/mod/sit!"))
+                ConfirmLinkScreen.opening(this, "https://modrinth.com/mod/sit!")
         ).dimensions(this.width / 2 - 100, startY + 72 + 12, 98, 20).build());
 
         this.addDrawableChild(ButtonWidget.builder(Text.translatable("gui.done"), (button) -> {
@@ -52,7 +48,7 @@ public class ConfigScreen extends Screen {
         }).dimensions(this.width / 2 + 2, startY + 72 + 12, 98, 20).build());
 
         TextureButtonWidget donateButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("sit!.gui.button.donate"),
-                ConfirmLinkScreen.opening(this, URI.create("https://Ko-fi.com/oth3r")), true)
+                ConfirmLinkScreen.opening(this, "https://Ko-fi.com/oth3r"), true)
                 .dimensions(20,20).texture(Identifier.of(Data.MOD_ID, "donate"), 15, 15).build());
         donateButton.setPosition(this.width / 2 + 105, startY + 72 + 12);
     }
@@ -73,8 +69,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/screen/UnderConstructionScreen.java

@@ -29,7 +29,7 @@ public class UnderConstructionScreen<T extends CustomFile<T>> extends Screen {
     protected void init() {
         int startY = this.height / 5-4;
         ButtonWidget foxPNG = this.addDrawableChild(new ClickableImageWidget(70,70,140,140, Tooltip.of(Text.of("Art by @bunnestbun")),
-                Identifier.of(Data.MOD_ID, "textures/gui/fox.png"), ConfirmLinkScreen.opening(this, URI.create("https://www.instagram.com/bunnestbun/"))));
+                Identifier.of(Data.MOD_ID, "textures/gui/fox.png"), ConfirmLinkScreen.opening(this, "https://www.instagram.com/bunnestbun/")));
         foxPNG.setPosition(this.width / 2 - (foxPNG.getWidth()/2), startY-35);
 
         ButtonWidget openFileButton = this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("sit!.gui.button.file"),
@@ -38,7 +38,7 @@ public class UnderConstructionScreen<T extends CustomFile<T>> extends Screen {
         openFileButton.setPosition(this.width / 2 - 70, startY+110);
 
         TextureButtonWidget folderButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("sit!.gui.button.folder"),
-                (button) -> Util.getOperatingSystem().open(Paths.get(this.file.getFile().getParent())), true)
+                (button) -> Util.getOperatingSystem().open(this.file.getFile().getParent()), true)
                 .dimensions(20,20).texture(Identifier.of(Data.MOD_ID, "folder"), 15, 15).build());
         folderButton.setPosition(this.width / 2 + 50, startY + 110);
 

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;
@@ -322,7 +321,7 @@ public class Utl {
                 player.sendMessage(messageTag().append(Utl.lang("sit!.chat.purged",Utl.lang("sit!.chat.purged.total",count).styled(
                         style -> style.withColor(Colors.LIGHT_GRAY).withItalic(true)
                 )).styled(
-                        style -> style.withColor(Colors.GREEN)
+                        style -> style.withColor(Formatting.GREEN)
                 )));
             }
         }