From 7a1f058f6c07c19ddfbb72276fc1c3c211d0c9b0 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+Oth3r@users.noreply.github.com> Date: Tue, 17 Jun 2025 10:34:23 -0500 Subject: [PATCH 1/5] 1.21.6 port --- src/main/java/one/oth3r/sit/utl/Events.java | 2 +- src/main/java/one/oth3r/sit/utl/Logic.java | 8 ++++---- src/main/java/one/oth3r/sit/utl/Utl.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/one/oth3r/sit/utl/Events.java b/src/main/java/one/oth3r/sit/utl/Events.java index 0b5c5e6..9e2be60 100644 --- a/src/main/java/one/oth3r/sit/utl/Events.java +++ b/src/main/java/one/oth3r/sit/utl/Events.java @@ -75,7 +75,7 @@ public class Events { // just send the sit command if (Data.isInGame()) { if (Data.isSupportedServer()) { - player.networkHandler.sendCommand("sit"); + player.networkHandler.sendChatCommand("sit"); } else { // unsupported server message if not in a Sit! server player.sendMessage(Utl.lang("sit!.chat.unsupported") diff --git a/src/main/java/one/oth3r/sit/utl/Logic.java b/src/main/java/one/oth3r/sit/utl/Logic.java index b128b94..d465de0 100644 --- a/src/main/java/one/oth3r/sit/utl/Logic.java +++ b/src/main/java/one/oth3r/sit/utl/Logic.java @@ -37,7 +37,7 @@ public class Logic { // check if the block is in the right y level limits from the config if (!checkYLimits(player, blockPos)) return false; - ServerWorld serverWorld = player.getServerWorld(); + ServerWorld serverWorld = player.getWorld(); Double sitHeight = Utl.getSittingHeight(player,blockPos,hitResult); @@ -60,7 +60,7 @@ public class Logic { public static boolean sit(ServerPlayerEntity player, BlockPos blockPos, @Nullable BlockHitResult hitResult) { if (!canSit(player, blockPos, hitResult)) return false; // assets - ServerWorld serverWorld = player.getServerWorld(); + ServerWorld serverWorld = player.getWorld(); Double sitHeight = Utl.getSittingHeight(player,blockPos,hitResult); // shouldn't be null because we already checked, but do another check to clear IDE errors assert sitHeight != null; @@ -77,7 +77,7 @@ public class Logic { * @return true if sitting was successful */ public static boolean sitLooking(ServerPlayerEntity player) { - return sit(player, Utl.getBlockPosPlayerIsLookingAt(player.getServerWorld(),player, + return sit(player, Utl.getBlockPosPlayerIsLookingAt(player.getWorld(),player, Utl.getPlayerReach(player)),null); } @@ -151,7 +151,7 @@ public class Logic { // get the new entity DisplayEntity.TextDisplayEntity sitEntity = Data.getSpawnList().get(player); // spawn and ride the entity - player.getServerWorld().spawnEntity(sitEntity); + player.getWorld().spawnEntity(sitEntity); player.startRiding(sitEntity); // add the entity to the list Data.addSitEntity(player, sitEntity); diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java index ea2fc19..00be53a 100644 --- a/src/main/java/one/oth3r/sit/utl/Utl.java +++ b/src/main/java/one/oth3r/sit/utl/Utl.java @@ -160,7 +160,7 @@ public class Utl { * @return null if not a valid block */ public static Double getSittingHeight(ServerPlayerEntity player, BlockPos blockPos, @Nullable BlockHitResult hit) { - ServerWorld serverWorld = player.getServerWorld(); + ServerWorld serverWorld = player.getWorld(); ServerConfig config = FileData.getServerConfig(); BlockState blockState = serverWorld.getBlockState(blockPos); Block block = blockState.getBlock(); @@ -306,7 +306,7 @@ public class Utl { /// FYI it cant purge an entity from a disconnected player or unloaded chunks // get a list of sit entities - List list = player.getServerWorld() + List list = player.getWorld() .getEntitiesByType(TypeFilter.instanceOf(DisplayEntity.TextDisplayEntity.class), entity -> entity.getName().getString().equals(Data.ENTITY_NAME)); From 3f9517a1f092b6fe12879199e4957f714a56419f Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+Oth3r@users.noreply.github.com> Date: Tue, 17 Jun 2025 10:34:33 -0500 Subject: [PATCH 2/5] 1.21.6 update --- gradle.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2c59928..19808a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,21 +4,21 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -min_minecraft_version=1.21.5 -max_minecraft_version=1.21.5 -minecraft_versions=1.21.5 +min_minecraft_version=1.21.6 +max_minecraft_version=1.21.6 +minecraft_versions=1.21.6 -minecraft_version=1.21.5 -yarn_mappings=1.21.5+build.1 +minecraft_version=1.21.6 +yarn_mappings=1.21.6+build.1 loader_version=0.16.14 # Mod Properties -mod_version=1.2.4.3+1.21.5 +mod_version=1.2.4.3+1.21.6 maven_group=one.oth3r file_name=sit! # Dependencies -fabric_version=0.124.0+1.21.5 -modmenu_version=14.0.0-rc.2 -otterlib_version=0.1.2.1+1.21.5-fabric -otterlib_max_version=0.2.0.0+1.21.5-fabric +fabric_version=0.127.0+1.21.6 +modmenu_version=15.0.0-beta.1 +otterlib_version=0.1.2.1+1.21.6-fabric +otterlib_max_version=0.2.0.0+1.21.6-fabric From e4f0625e4c5fa0dd218741e9f06620322df02257 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Fri, 27 Jun 2025 17:28:15 -0500 Subject: [PATCH 3/5] add devauth and update dependency formatting --- build.gradle | 17 +++++++++++++---- gradle.properties | 4 +++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 183d3f8..ba352c7 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,14 @@ base { repositories { mavenLocal() - maven { url = "https://maven.terraformersmc.com/releases/" } + maven { + name = "DevAuth" + url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" + } + maven { + name = "Terraformers" + url = "https://maven.terraformersmc.com/" + } maven { name "oth3rMavenSnapshots" url "https://maven.oth3r.one/snapshots" @@ -30,11 +37,13 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + // required dependencies modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" - modImplementation "one.oth3r:otterlib:${project.otterlib_version}" + + // optional dependencies + modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" + modRuntimeOnly "me.djtheredstoner:DevAuth-fabric:${project.devauth_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index c390513..5550d7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,6 +19,8 @@ file_name=sit! # Dependencies fabric_version=0.127.1+1.21.6 -modmenu_version=15.0.0-beta.1 otterlib_version=0.2.1.0+1.21.6-fabric otterlib_max_version=0.3.0.0+1.21.6-fabric + +modmenu_version=15.0.0-beta.1 +devauth_version=1.2.1 From b8b726563eabac0fa47b2cab9dcd781927f831ee Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Mon, 30 Jun 2025 09:53:42 -0500 Subject: [PATCH 4/5] v1.2.4.5+1.21.7 --- gradle.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5550d7b..fda1a3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,23 +4,23 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -min_minecraft_version=1.21.6 -max_minecraft_version=1.21.6 -minecraft_versions=1.21.6 +min_minecraft_version=1.21.7 +max_minecraft_version=1.21.7 +minecraft_versions=1.21.7 -minecraft_version=1.21.6 -yarn_mappings=1.21.6+build.1 +minecraft_version=1.21.7 +yarn_mappings=1.21.7+build.1 loader_version=0.16.14 # Mod Properties -mod_version=1.2.4.5+1.21.6 +mod_version=1.2.4.5+1.21.7 maven_group=one.oth3r file_name=sit! # Dependencies -fabric_version=0.127.1+1.21.6 -otterlib_version=0.2.1.0+1.21.6-fabric -otterlib_max_version=0.3.0.0+1.21.6-fabric +fabric_version=0.128.1+1.21.7 +otterlib_version=0.2.1.0+1.21.7-fabric +otterlib_max_version=0.3.0.0+1.21.7-fabric modmenu_version=15.0.0-beta.1 devauth_version=1.2.1 From 9d6881d9f5102a38af05d14bd1255b2dbb30e781 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Thu, 17 Jul 2025 10:14:30 -0500 Subject: [PATCH 5/5] updated readme; new badges --- README.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 47fbea2..22fec77 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ - +![banner](https://media.oth3r.one/-bQHprrBRYY/sit!%20banner%20480x270.png) -[![github](https://img.shields.io/github/issues/oth3r/Sit?logo=github?label=Issues)](https://github.com/Oth3r/Sit/releases) [![Crowdin](https://badges.crowdin.net/oth3r-sit/localized.svg)](https://crowdin.com/project/oth3r-sit) [![discord](https://dcbadge.vercel.app/api/server/https://discord.gg/AVSTHCAUvn?style=flat)](https://www.oth3r.one/discord) - -[![modrinth](https://img.shields.io/modrinth/dt/sit!?label=Modrinth&logo=modrinth)](https://modrinth.com/mod/sit!) [![curseforge](https://cf.way2muchnoise.eu/892424.svg)](https://www.curseforge.com/minecraft/mc-mods/Sit1) +[![issues](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/documentation/issues_64h.png?raw=true)](https://github.com/Oth3r/Sit/issues) +[![localization](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/translate/crowdin_64h.png?raw=true)](https://crowdin.com/project/oth3r-sit) +[![discord](https://github.com/intergrav/devins-badges/blob/v3/assets/cozy/social/discord-singular_64h.png?raw=true)](https://www.oth3r.one/discord) +[![otterlib_dep](https://media.oth3r.one/-a7bWaVAVW5/requires_otterlib.png)](https://modrinth.com/plugin/otterlib) ### **Sit!** is a vanilla+ mod that adds sitting in minecraft. * Sit on **stairs**, **slabs**, **carpets** by default, and sit on everything else by tweaking the config! @@ -41,28 +42,29 @@ Don't want to accidentally sit down? Set custom restrictions for each hand in th \ Use **player unique** hand restrictions when connecting to a `Sit!` server on a `Sit!` Client! -per player hand restriction showcase +![per player hand restriction showcase](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/hand_restrictions.gif?raw=true) ### 🟩 Custom Blocks Want to sit on _**EVERY**_ block? With the config you can add more sitting options! \ With the new config system, block tags and custom blockstates can be used to mass select blocks at ease. -players sitting on a vast range of blocks +![players sitting on a vast range of blocks](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/custom_blocks.gif?raw=true) ### ⌨️ Keybinds Don't want to sit with the **just** the hand? Use a keybind or type a command to sit instead! -setting keybinds for the sit mod, and sitting by using them +![setting keybinds for the sit mod, and sitting by using them](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/keybinds.gif?raw=true) ### 📃 Customizable Config Don't like the default settings? Go wild in the config for yourself or your players! -the Sit! config wiki page -## Future Goals +![the Sit! config wiki page](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/config.gif?raw=true) + +## 🎯 Future Goals * NeoForge Port * Full config via [OtterLib](https://modrinth.com/mod/otterlib) + +## 🔗 Where to download +[![modrinth](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/available/modrinth_64h.png?raw=true)](https://modrinth.com/mod/sit!) +[![curseforge](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/available/curseforge_64h.png?raw=true)](https://www.curseforge.com/minecraft/mc-mods/Sit1) \ No newline at end of file