From 1d08ee6775bb848c76eaa6164eb5b30656e2fe53 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 16 May 2024 15:09:25 -0500 Subject: [PATCH 1/6] fixed changing settings mid-game not sending updates to the server --- src/main/java/one/oth3r/sit/SitClient.java | 14 +++++++++----- src/main/java/one/oth3r/sit/file/Config.java | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/one/oth3r/sit/SitClient.java b/src/main/java/one/oth3r/sit/SitClient.java index fe6dbb3..9db2f99 100644 --- a/src/main/java/one/oth3r/sit/SitClient.java +++ b/src/main/java/one/oth3r/sit/SitClient.java @@ -5,7 +5,6 @@ import com.google.gson.GsonBuilder; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.minecraft.network.packet.CustomPayload; import one.oth3r.sit.packet.CustomPayloads; public class SitClient implements ClientModInitializer { @@ -16,14 +15,19 @@ public class SitClient implements ClientModInitializer { ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> { inGame = true; // send a data packet whenever joining a server - ClientPlayNetworking.send(sendPackets()); + sendSettingsPackets(); }); // reset inGame ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> inGame = false); } - public static CustomPayload sendPackets() { - Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - return new CustomPayloads.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings())); + /** + * sends the settings packets to the server is the client is in game + */ + public static void sendSettingsPackets() { + if (inGame) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + ClientPlayNetworking.send(new CustomPayloads.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings()))); + } } } diff --git a/src/main/java/one/oth3r/sit/file/Config.java b/src/main/java/one/oth3r/sit/file/Config.java index 0910817..5c5c802 100644 --- a/src/main/java/one/oth3r/sit/file/Config.java +++ b/src/main/java/one/oth3r/sit/file/Config.java @@ -213,7 +213,7 @@ public class Config { file.write("\nhand.off.whitelist="+gson.toJson(offWhitelist)); file.write("\nhand.off.blacklist="+gson.toJson(offBlacklist)); // send packets to update the settings on the server - if (SitClient.inGame) SitClient.sendPackets(); + SitClient.sendSettingsPackets(); } catch (Exception e) { e.printStackTrace(); } From c562fcf12e11f9204c02f6be4303c5a9dad3052e Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 16 May 2024 15:09:45 -0500 Subject: [PATCH 2/6] added a logger to receiving settings from the player --- src/main/java/one/oth3r/sit/Sit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index 268dfb1..9874dad 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -41,7 +41,7 @@ public class Sit implements ModInitializer { ServerPlayNetworking.registerGlobalReceiver(CustomPayloads.SettingsPayload.ID,((payload, context) -> server.execute(() -> { Type hashMapToken = new TypeToken>() {}.getType(); Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - + LOGGER.info(String.format("Received custom sitting settings from %s.",context.player().getName().getString())); playerSettings.put(context.player(),gson.fromJson(payload.value(),hashMapToken)); }))); } From ce8eacd8a0a2c5692da33785b46be764b682361f Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 16 May 2024 15:09:54 -0500 Subject: [PATCH 3/6] v1.1.6+1.20.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 63e430d..4e4f382 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.20.6+build.1 loader_version=0.15.10 # Mod Properties -mod_version=1.1.5+1.20.6 +mod_version=1.1.6+1.20.6 maven_group=one.oth3r archives_base_name=sit! From ca86597498f4b1c128b0bacb4dce8bf36474ef36 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 13 Jun 2024 10:40:34 -0500 Subject: [PATCH 4/6] 1.21 changes --- 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 61a4c39..fa5d50c 100644 --- a/src/main/java/one/oth3r/sit/Events.java +++ b/src/main/java/one/oth3r/sit/Events.java @@ -247,7 +247,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()); + player.teleport(player.getX(),player.getBlockY()+1,player.getZ(),false); 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 9d6a57d..7d1fea9 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<>(new Identifier(Sit.MOD_ID,"settings_v1.1")); + public static final Id ID = new Id<>(Identifier.of(Sit.MOD_ID,"settings_v1.1")); public static final PacketCodec CODEC = PacketCodecs.STRING.xmap(SettingsPayload::new, SettingsPayload::value).cast(); From 01c3bf0e572415f580d86d6d2367a1b87d7d0a52 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 13 Jun 2024 10:41:07 -0500 Subject: [PATCH 5/6] use $minecraft_version for the version --- build.gradle | 5 +++-- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e496e54..506104f 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ base { repositories { maven { url "https://maven.terraformersmc.com/releases/" } maven { url "https://maven.isxander.dev/releases" } - maven { url "https://maven.isxander.dev/snapshots" } } dependencies { @@ -29,9 +28,11 @@ dependencies { processResources { inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version filesMatching("fabric.mod.json") { - expand "version": project.version + expand "version": project.version, + "minecraft_version": project.minecraft_version } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 89b9ac9..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.20.6 <=1.20.6", + "minecraft": "=${minecraft_version}", "java": ">=17", "fabric-api": "*" }, From 384767b24c98a182c897bcb85a190ed174562eb8 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 13 Jun 2024 10:41:19 -0500 Subject: [PATCH 6/6] v1.1.6+1.21 --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4e4f382..9063459 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.20.6 -yarn_mappings=1.20.6+build.1 -loader_version=0.15.10 +minecraft_version=1.21 +yarn_mappings=1.21+build.1 +loader_version=0.15.11 # Mod Properties -mod_version=1.1.6+1.20.6 +mod_version=1.1.6+1.21 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.97.8+1.20.6 -modmenu_version=10.0.0-beta.1 -yacl_version=3.4.1+1.20.5-fabric +fabric_version=0.100.1+1.21 +modmenu_version=11.0.0-beta.1 +yacl_version=3.5.0+1.21-fabric