mirror of
https://github.com/Oth3r/Sit.git
synced 2025-09-19 16:03:22 +02:00
Merge branch '1.20.4' into 1.20.1
# Conflicts: # gradle.properties # src/main/java/one/oth3r/sit/utl/Utl.java
This commit is contained in:
commit
3aad63e1ba
6 changed files with 17 additions and 6 deletions
|
@ -1,5 +1,5 @@
|
|||
# Sit!
|
||||
[](https://github.com/Oth3r/Sit/releases) [](https://crowdin.com/project/oth3r-sit) [](https://discord.gg/Mec6yNQ9B7)
|
||||
[](https://github.com/Oth3r/Sit/releases) [](https://crowdin.com/project/oth3r-sit) [](https://www.oth3r.one/discord)
|
||||
|
||||
[](https://modrinth.com/mod/sit!) [](https://www.curseforge.com/minecraft/mc-mods/Sit1)
|
||||
|
||||
|
|
|
@ -39,6 +39,7 @@ processResources {
|
|||
version : project.version,
|
||||
minecraft_version : minecraft_version,
|
||||
min_minecraft_version : min_minecraft_version,
|
||||
max_minecraft_version : max_minecraft_version,
|
||||
loader_version : loader_version
|
||||
]
|
||||
|
||||
|
@ -94,7 +95,7 @@ modrinth {
|
|||
versionName = "v${project.mod_version} [Fabric]"
|
||||
versionType = "release"
|
||||
uploadFile = remapJar
|
||||
gameVersions = [project.minecraft_version]
|
||||
gameVersions = project.minecraft_versions.split(",").toList()
|
||||
loaders = ['fabric', 'quilt']
|
||||
dependencies = [
|
||||
new ModDependency('P7dR8mSH', 'required'),
|
||||
|
|
|
@ -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
|
||||
* fixed not being able to sit when the Y level was below 0
|
|
@ -5,12 +5,15 @@ org.gradle.parallel=true
|
|||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/develop
|
||||
min_minecraft_version=1.20.1
|
||||
max_minecraft_version=1.20.1
|
||||
minecraft_versions=1.20.1
|
||||
|
||||
minecraft_version=1.20.1
|
||||
yarn_mappings=1.20.1+build.10
|
||||
loader_version=0.14.24
|
||||
loader_version=0.16.13
|
||||
|
||||
# Mod Properties
|
||||
mod_version=1.2.3+1.20.1
|
||||
mod_version=1.2.3.2+1.20.1
|
||||
maven_group=one.oth3r
|
||||
file_name=sit!
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken;
|
|||
import com.google.gson.stream.JsonReader;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
import com.google.gson.stream.MalformedJsonException;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.block.enums.BlockHalf;
|
||||
import net.minecraft.block.enums.SlabType;
|
||||
|
@ -368,7 +369,8 @@ public class Utl {
|
|||
* sends the settings packets to the server, if client & in game
|
||||
*/
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
},
|
||||
"depends": {
|
||||
"fabricloader": ">=0.14.21",
|
||||
"minecraft": ">=${min_minecraft_version} <=${minecraft_version}",
|
||||
"minecraft": ">=${min_minecraft_version} <=${max_minecraft_version}",
|
||||
"fabric": "*"
|
||||
},
|
||||
"suggests": {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue