virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-19 16:03:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.20.4' into 1.20.1

Browse source 
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Utl.java
This commit is contained in:
Oth3r 2025-05-03 12:28:01 -05:00
commit 3aad63e1ba
6 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,5 +1,5 @@
# Sit! # Sit!
[![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/Mec6yNQ9B7?style=flat)](https://discord.gg/Mec6yNQ9B7) [![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) [![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)

3
build.gradle
View file

@ -39,6 +39,7 @@ processResources {
version : project.version, version : project.version,
minecraft_version : minecraft_version, minecraft_version : minecraft_version,
min_minecraft_version : min_minecraft_version, min_minecraft_version : min_minecraft_version,
max_minecraft_version : max_minecraft_version,
loader_version : loader_version loader_version : loader_version
] ]
@ -94,7 +95,7 @@ modrinth {
versionName = "v${project.mod_version} [Fabric]" versionName = "v${project.mod_version} [Fabric]"
versionType = "release" versionType = "release"
uploadFile = remapJar uploadFile = remapJar
gameVersions = [project.minecraft_version] gameVersions = project.minecraft_versions.split(",").toList()
loaders = ['fabric', 'quilt'] loaders = ['fabric', 'quilt']
dependencies = [ dependencies = [
new ModDependency('P7dR8mSH', 'required'), new ModDependency('P7dR8mSH', 'required'),

5
changelog.md
View file

@ -1,2 +1,7 @@
# v1.2.3.2
* added an extra check before sending packets to the server from the client
# v1.2.3.1
* added a version position for quick patches
* fixed sitting height being off by .2 (1.21.4-5)
# v1.2.3 # v1.2.3
* fixed not being able to sit when the Y level was below 0 * fixed not being able to sit when the Y level was below 0

7
gradle.properties
View file

@ -5,12 +5,15 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
min_minecraft_version=1.20.1 min_minecraft_version=1.20.1
max_minecraft_version=1.20.1
minecraft_versions=1.20.1
minecraft_version=1.20.1 minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10 yarn_mappings=1.20.1+build.10
loader_version=0.14.24 loader_version=0.16.13
# Mod Properties # Mod Properties
mod_version=1.2.3+1.20.1 mod_version=1.2.3.2+1.20.1
maven_group=one.oth3r maven_group=one.oth3r
file_name=sit! file_name=sit!

4
src/main/java/one/oth3r/sit/utl/Utl.java
View file

@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import com.google.gson.stream.MalformedJsonException; import com.google.gson.stream.MalformedJsonException;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.minecraft.block.*; import net.minecraft.block.*;
import net.minecraft.block.enums.BlockHalf; import net.minecraft.block.enums.BlockHalf;
import net.minecraft.block.enums.SlabType; import net.minecraft.block.enums.SlabType;
@ -368,7 +369,8 @@ public class Utl {
* sends the settings packets to the server, if client & in game * sends the settings packets to the server, if client & in game
*/ */
public static void sendSettingsPackets() { public static void sendSettingsPackets() {
if (Data.isClient() && Data.isInGame()) { if (Data.isClient() && Data.isInGame() &&
ClientPlayNetworking.canSend(PacketSender.getIdentifier(PacketType.SETTINGS))) {
new PacketSender(PacketType.SETTINGS, Utl.getGson().toJson(FileData.getSittingConfig())).sendToServer(); new PacketSender(PacketType.SETTINGS, Utl.getGson().toJson(FileData.getSittingConfig())).sendToServer();
} }
} }

2
src/main/resources/fabric.mod.json
View file

@ -27,7 +27,7 @@
}, },
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.14.21",
"minecraft": ">=${min_minecraft_version} <=${minecraft_version}", "minecraft": ">=${min_minecraft_version} <=${max_minecraft_version}",
"fabric": "*" "fabric": "*"
}, },
"suggests": { "suggests": {