Merge branch 'refs/heads/master' into 1.20.4

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/Sit.java
#	src/main/java/one/oth3r/sit/SitClient.java
#	src/main/java/one/oth3r/sit/packet/CustomPayloads.java
#	src/main/resources/fabric.mod.json

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
 	}
 }
 

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.20.4+build.3
 loader_version=0.15.10
 
 # Mod Properties
-mod_version=1.1.5+1.20.2-1.20.4
+mod_version=1.1.6+1.20.4
 maven_group=one.oth3r
 archives_base_name=sit!
 

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();
                     }

src/main/java/one/oth3r/sit/Sit.java

@@ -40,6 +40,7 @@ public class Sit implements ModInitializer {
 			// copy to not throw errors
 			PacketBuilder packet = new PacketBuilder(buf.copy());
 			server.execute(() -> {
+                        LOGGER.info(String.format("Received custom sitting settings from %s.",player.getName().getString()));
 						Type hashMapToken = new TypeToken<HashMap<String, Object>>() {}.getType();
 						Gson gson = new GsonBuilder().disableHtmlEscaping().create();
 						playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken));

src/main/java/one/oth3r/sit/SitClient.java

@@ -13,13 +13,19 @@ public class SitClient implements ClientModInitializer {
         ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
             inGame = true;
             // send a data packet whenever joining a server
-            client.execute(SitClient::sendPackets);
+            sendSettingsPackets();
         });
         // reset inGame
         ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> inGame = false);
     }
-    public static void sendPackets() {
-        Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-        new PacketBuilder(gson.toJson(Utl.HandSettings.getHandSettings())).send();
+
+    /**
+     * 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();
+            new PacketBuilder(gson.toJson(Utl.HandSettings.getHandSettings())).send();
+        }
     }
 }

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();
         }

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
 	},
 	"depends": {
 		"fabricloader": ">=0.14.21",
-		"minecraft": ">=1.20.2 <=1.20.4",
+		"minecraft": "=${minecraft_version}",
 		"java": ">=17",
 		"fabric-api": "*"
 	},