From a7b70323e48c6a94ad1303d1de6d44b7b1ff7423 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 22 Jul 2024 10:34:21 -0500 Subject: [PATCH 01/10] Revert "1.21 changes" This reverts commit ca86597498f4b1c128b0bacb4dce8bf36474ef36. --- src/main/java/one/oth3r/sit/Events.java | 2 +- src/main/java/one/oth3r/sit/packet/CustomPayloads.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/one/oth3r/sit/Events.java b/src/main/java/one/oth3r/sit/Events.java index a604bab..7371e3b 100644 --- a/src/main/java/one/oth3r/sit/Events.java +++ b/src/main/java/one/oth3r/sit/Events.java @@ -248,7 +248,7 @@ public class Events { BlockState blockState = player.getWorld().getBlockState(pos); // check if said block is still there if (blockState.isAir()) { - player.teleport(player.getX(),player.getBlockY()+1,player.getZ(),false); + player.teleport(player.getX(),player.getBlockY()+1,player.getZ()); entity.setRemoved(Entity.RemovalReason.DISCARDED); entityLoop.remove(); } diff --git a/src/main/java/one/oth3r/sit/packet/CustomPayloads.java b/src/main/java/one/oth3r/sit/packet/CustomPayloads.java index 7d1fea9..9d6a57d 100644 --- a/src/main/java/one/oth3r/sit/packet/CustomPayloads.java +++ b/src/main/java/one/oth3r/sit/packet/CustomPayloads.java @@ -10,7 +10,7 @@ import one.oth3r.sit.Sit; public class CustomPayloads { public record SettingsPayload(String value) implements CustomPayload { - public static final Id ID = new Id<>(Identifier.of(Sit.MOD_ID,"settings_v1.1")); + public static final Id ID = new Id<>(new Identifier(Sit.MOD_ID,"settings_v1.1")); public static final PacketCodec CODEC = PacketCodecs.STRING.xmap(SettingsPayload::new, SettingsPayload::value).cast(); From ada03ba40e3c2a0e511bea1cbf1c0b03159fbe56 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 22 Jul 2024 10:39:47 -0500 Subject: [PATCH 02/10] v1.1.8+1.20.6 --- gradle.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 294ae81..832f796 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21 -yarn_mappings=1.21+build.1 +minecraft_version=1.20.6 +yarn_mappings=1.20.6+build.3 loader_version=0.15.11 # Mod Properties -mod_version=1.1.8+1.21 +mod_version=1.1.8+1.20.6 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.100.1+1.21 -modmenu_version=11.0.0-beta.1 -yacl_version=3.5.0+1.21-fabric +fabric_version=0.100.4+1.20.6 +modmenu_version=10.0.0-beta.1 +yacl_version=3.5.0+1.20.6-fabric From 7bf178a1d254b006536db0501a38fa26d69fb1fb Mon Sep 17 00:00:00 2001 From: Oth3r Date: Sat, 24 Aug 2024 17:09:10 -0500 Subject: [PATCH 03/10] fix multi version fabric json --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b311131..95deb70 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,7 +27,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": ">=1.21 <=${minecraft_version}", + "minecraft": "=${minecraft_version}", "java": ">=17", "fabric-api": "*" }, From 77f59e7b6a7fb3da8faae8de14b2c4876008203e Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 25 Nov 2024 13:16:24 -0600 Subject: [PATCH 04/10] 1.21.1 port --- .../java/one/oth3r/sit/screen/ClickableImageWidget.java | 5 +++-- src/main/java/one/oth3r/sit/screen/ConfigScreen.java | 6 ++---- src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java | 3 +-- src/main/java/one/oth3r/sit/utl/Utl.java | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java b/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java index fb14e4f..375c367 100644 --- a/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java +++ b/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); } } diff --git a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java b/src/main/java/one/oth3r/sit/screen/ConfigScreen.java index b64eb60..4f058d1 100644 --- a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java +++ b/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"), - x, y, 0.0f, 0.0f, 128, 72, 128, 72, ColorHelper.getWhite(alpha)); + context.drawTexture(Identifier.of(Data.MOD_ID, "textures/gui/banner.png"), + x, y, 0.0f, 0.0f, 128, 72, 128, 72); RenderSystem.disableBlend(); } diff --git a/src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java b/src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java index 6a13691..122137b 100644 --- a/src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java +++ b/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 diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java index 7be286e..561b5f4 100644 --- a/src/main/java/one/oth3r/sit/utl/Utl.java +++ b/src/main/java/one/oth3r/sit/utl/Utl.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; 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; From 78f7d81d938d641ea306d419e8be6ec6bfc3a3bf Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 25 Nov 2024 13:16:45 -0600 Subject: [PATCH 05/10] 1.2.0+1.21-1.21.1 --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 90f6f01..1720dc0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -min_minecraft_version=1.21.3 -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 -loader_version=0.16.7 +min_minecraft_version=1.21 +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.16.9 # Mod Properties -mod_version=1.2.0+1.21.3 +mod_version=1.2.0+1.21-1.21.1 maven_group=one.oth3r file_name=sit! # Dependencies -fabric_version=0.107.0+1.21.3 -modmenu_version=12.0.0-beta.1 +fabric_version=0.109.0+1.21.1 +modmenu_version=11.0.0-beta.1 From 32a4b0006a53976059f5dbf97f5e659f0705fde5 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 27 Nov 2024 10:42:50 -0600 Subject: [PATCH 06/10] 1.20.6 port --- src/main/java/one/oth3r/sit/file/CustomBlock.java | 2 +- src/main/java/one/oth3r/sit/file/CustomItem.java | 4 ++-- src/main/java/one/oth3r/sit/screen/ConfigScreen.java | 8 +++----- .../one/oth3r/sit/screen/UnderConstructionScreen.java | 4 ++-- src/main/java/one/oth3r/sit/utl/Utl.java | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/one/oth3r/sit/file/CustomBlock.java b/src/main/java/one/oth3r/sit/file/CustomBlock.java index 0c4f5e7..2bd4c04 100644 --- a/src/main/java/one/oth3r/sit/file/CustomBlock.java +++ b/src/main/java/one/oth3r/sit/file/CustomBlock.java @@ -89,7 +89,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; } diff --git a/src/main/java/one/oth3r/sit/file/CustomItem.java b/src/main/java/one/oth3r/sit/file/CustomItem.java index ec1ef5f..05515f6 100644 --- a/src/main/java/one/oth3r/sit/file/CustomItem.java +++ b/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 diff --git a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java b/src/main/java/one/oth3r/sit/screen/ConfigScreen.java index 4f058d1..637bd6a 100644 --- a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java +++ b/src/main/java/one/oth3r/sit/screen/ConfigScreen.java @@ -10,8 +10,6 @@ import net.minecraft.util.Identifier; 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; @@ -36,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) -> { @@ -50,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); } diff --git a/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java b/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java index 8395f35..ba418fc 100644 --- a/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java +++ b/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java @@ -29,7 +29,7 @@ public class UnderConstructionScreen> 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> 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); diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java index 561b5f4..03e6cd1 100644 --- a/src/main/java/one/oth3r/sit/utl/Utl.java +++ b/src/main/java/one/oth3r/sit/utl/Utl.java @@ -366,7 +366,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) ))); } } From 08788456b2034c6bc00560e23a53c6b0251c04bb Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 17 Feb 2025 16:05:18 -0600 Subject: [PATCH 07/10] 1.21.3 --- gradle.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9047fb5..08df4aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -min_minecraft_version=1.21.4 -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.8 +min_minecraft_version=1.21.3 +minecraft_version=1.21.3 +yarn_mappings=1.21.3+build.2 loader_version=0.16.10 # Mod Properties @@ -15,5 +15,5 @@ maven_group=one.oth3r file_name=sit! # Dependencies -fabric_version=0.116.1+1.21.4 -modmenu_version=13.0.0-beta.1 +fabric_version=0.114.0+1.21.3 +modmenu_version=12.0.0-beta.1 From a9399fcbf9117733795da47e1bc8686ebd5fbd0e Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 18 Feb 2025 12:07:14 -0600 Subject: [PATCH 08/10] 1.21.3 number fix --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 08df4aa..67f1082 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ yarn_mappings=1.21.3+build.2 loader_version=0.16.10 # Mod Properties -mod_version=1.2.2+1.21.4 +mod_version=1.2.2+1.21.3 maven_group=one.oth3r file_name=sit! From b5eaf3df7ad1ced18691b34b1865c6463be0b02a Mon Sep 17 00:00:00 2001 From: Oth3r Date: Sun, 23 Feb 2025 15:06:21 -0600 Subject: [PATCH 09/10] 1.21-1.21.1 version fix --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5934e3a..fbe92d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ yarn_mappings=1.21.1+build.3 loader_version=0.16.9 # Mod Properties -mod_version=1.2.1+1.21-1.21.1 +mod_version=1.2.2+1.21-1.21.1 maven_group=one.oth3r file_name=sit! From 65431280a3baff9f9bcb89f46f5a3377d5c122ef Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+Oth3r@users.noreply.github.com> Date: Thu, 13 Mar 2025 17:47:43 -0500 Subject: [PATCH 10/10] update loom and gradle statements --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 44ebae0..c23d6f0 100644 --- a/build.gradle +++ b/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.isxander.dev/releases" } + maven { url = "https://maven.terraformersmc.com/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,