From f18872844067a2aad5f98c17a9c5098cbe77e14f Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 24 Oct 2023 18:34:53 -0500 Subject: [PATCH 1/9] 1.20.1 dependencies --- gradle.properties | 10 +++++----- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 952abc0..d41b7b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.1 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 loader_version=0.14.22 # Mod Properties @@ -14,6 +14,6 @@ maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.89.0+1.20.2 -modmenu_version=8.0.0 -yacl_version=3.2.1+1.20.2 +fabric_version=0.90.4+1.20.1 +modmenu_version=7.0.0 +yacl_version=3.2.1+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6e25fb8..13a5a5e 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.2", + "minecraft": ">=1.20 <=1.20.1", "java": ">=17", "fabric-api": "*" }, From ec261127756fbfb9394b97a669618bd2b5658577 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 24 Oct 2023 18:37:06 -0500 Subject: [PATCH 2/9] Revert "1.20.2 shifts everything down by .25" This reverts commit b0ae9940508219800f78be9a424f89fc39b99b8c. --- src/main/java/one/oth3r/sit/Events.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/one/oth3r/sit/Events.java b/src/main/java/one/oth3r/sit/Events.java index 70a8540..d136ebb 100644 --- a/src/main/java/one/oth3r/sit/Events.java +++ b/src/main/java/one/oth3r/sit/Events.java @@ -116,24 +116,23 @@ public class Events { public static void setEntity(BlockPos pos, World world, Entity entity) { Block block = world.getBlockState(pos).getBlock(); entity.setCustomName(Text.of(Sit.ENTITY_NAME)); - double hitBoxY = 0.5; entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.47, pos.getZ() + 0.5, 0, 0); entity.setInvulnerable(true); if (block instanceof StairsBlock) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.27, pos.getZ() + 0.5, 0, 0); - hitBoxY = 2; + entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,2,1.5)); } if (block instanceof SlabBlock) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.27, pos.getZ() + 0.5, 0, 0); - hitBoxY = 1; + entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,1,1.5)); } if (block instanceof CarpetBlock) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()-.17, pos.getZ() + 0.5, 0, 0); - hitBoxY = 0.125; + entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,0.125,1.5)); } if (world.getBlockState(pos).isFullCube(world,pos.add(0,1,0))) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.78, pos.getZ() + 0.5, 0, 0); - hitBoxY = 2; + entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,2,1.5)); } if (config.customOn && config.customBlocks.size() != 0) { for (HashMap map:getCustomBlocks().values()) { @@ -141,15 +140,12 @@ public class Events { if (map.get("block").equals(blockID)) { double input = Math.max(Math.min(Double.parseDouble((String) map.get("height")),1),0); entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+input-.22, pos.getZ() + 0.5, 0, 0); - hitBoxY = Double.parseDouble((String) map.get("hitbox")); + entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,Double.parseDouble((String) map.get("hitbox")),1.5)); } } } - //1.20.2 mounting pos change (shifts everything down by .25) - entity.updatePositionAndAngles(entity.getX(),entity.getY()+.25,entity.getZ(),0,0); - entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,hitBoxY,1.5)); //change pitch based on if player is sitting below block height or not - if (entity.getY() <= pos.getY()+.35+.25) entity.setPitch(90); + if (entity.getY() <= pos.getY()+.35) entity.setPitch(90); else entity.setPitch(-90); } public static void register() { From 213e041729038482243522a791ce47811bb4a14f Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 24 Oct 2023 18:39:03 -0500 Subject: [PATCH 3/9] v1.0.3+1.20-1.20.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d41b7b2..83bd8d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10 loader_version=0.14.22 # Mod Properties -mod_version=1.0.3+1.20.2 +mod_version=1.0.3+1.20-1.20.1 maven_group=one.oth3r archives_base_name=sit! From ede8f290dcd72dce591869b27ec8378e4546aa28 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Sun, 26 Nov 2023 10:16:36 -0600 Subject: [PATCH 4/9] 1.20-1.20.1 fix --- .../java/one/oth3r/sit/PacketBuilder.java | 2 +- src/main/java/one/oth3r/sit/Sit.java | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/one/oth3r/sit/PacketBuilder.java b/src/main/java/one/oth3r/sit/PacketBuilder.java index 55bb0c1..538609d 100644 --- a/src/main/java/one/oth3r/sit/PacketBuilder.java +++ b/src/main/java/one/oth3r/sit/PacketBuilder.java @@ -14,7 +14,7 @@ public class PacketBuilder { private PacketByteBuf packetByteBuf = PacketByteBufs.create(); public PacketBuilder(PacketByteBuf buf) { // Read any data sent in the packet - message = StandardCharsets.UTF_8.decode(ByteBuffer.wrap(buf.array())).toString().trim(); + message = buf.toString(StandardCharsets.UTF_8); packetByteBuf = buf; } public PacketBuilder(String message) { diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index d89f49d..09bb4e3 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -3,6 +3,8 @@ package one.oth3r.sit; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; +import io.netty.buffer.ByteBuf; +import io.netty.util.ReferenceCountUtil; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; @@ -15,6 +17,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; import java.util.HashMap; public class Sit implements ModInitializer { @@ -35,12 +39,15 @@ public class Sit implements ModInitializer { Events.register(); //PACKETS ServerPlayNetworking.registerGlobalReceiver(PacketBuilder.getIdentifier(), - (server, player, handler, buf, responseSender) -> server.execute(() -> { - PacketBuilder packet = new PacketBuilder(buf); - Type hashMapToken = new TypeToken>() {}.getType(); - Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken)); - })); + (server, player, handler, buf, responseSender) -> { + buf.retain(); + server.execute(() -> { + PacketBuilder packet = new PacketBuilder(buf); + Type hashMapToken = new TypeToken>() {}.getType(); + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken)); + }); + }); } public static MutableText lang(String key, Object... args) { if (isClient) return Text.translatable(key, args); From bf736d17a2d134d7a4e84811b692f292edde5c26 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Sun, 26 Nov 2023 10:17:04 -0600 Subject: [PATCH 5/9] update 1.20.1 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 154df87..d90c86e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 -loader_version=0.14.22 +loader_version=0.14.24 # Mod Properties mod_version=1.1.0+1.20-1.20.1 @@ -14,6 +14,6 @@ maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.4+1.20.1 +fabric_version=0.91.0+1.20.1 modmenu_version=7.0.0 yacl_version=3.2.1+1.20 From a1d651f2dd100eb44afda39391b0604862362b8d Mon Sep 17 00:00:00 2001 From: Oth3r Date: Sun, 26 Nov 2023 10:19:34 -0600 Subject: [PATCH 6/9] make sure the buf is released --- src/main/java/one/oth3r/sit/Sit.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index 09bb4e3..420a028 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -47,6 +47,7 @@ public class Sit implements ModInitializer { Gson gson = new GsonBuilder().disableHtmlEscaping().create(); playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken)); }); + buf.release(); }); } public static MutableText lang(String key, Object... args) { From 41474091dca0747c798ff7112533e2287cc121c0 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Sun, 26 Nov 2023 10:35:49 -0600 Subject: [PATCH 7/9] the REAL 1.20-1.20.1 fix this time --- src/main/java/one/oth3r/sit/PacketBuilder.java | 7 ++++--- src/main/java/one/oth3r/sit/Sit.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/one/oth3r/sit/PacketBuilder.java b/src/main/java/one/oth3r/sit/PacketBuilder.java index 538609d..ac4bb96 100644 --- a/src/main/java/one/oth3r/sit/PacketBuilder.java +++ b/src/main/java/one/oth3r/sit/PacketBuilder.java @@ -1,5 +1,6 @@ package one.oth3r.sit; +import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.minecraft.network.PacketByteBuf; @@ -12,10 +13,10 @@ public class PacketBuilder { public static final String SETTINGS = "settings_v1.0"; private final String message; private PacketByteBuf packetByteBuf = PacketByteBufs.create(); - public PacketBuilder(PacketByteBuf buf) { + public PacketBuilder(ByteBuf buf) { // Read any data sent in the packet - message = buf.toString(StandardCharsets.UTF_8); - packetByteBuf = buf; + packetByteBuf.writeBytes(buf); + message = packetByteBuf.toString(StandardCharsets.UTF_8); } public PacketBuilder(String message) { this.message = message; diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index 420a028..cf985eb 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -8,6 +8,7 @@ import io.netty.util.ReferenceCountUtil; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.network.PacketByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandManager; import net.minecraft.server.network.ServerPlayerEntity; @@ -40,14 +41,13 @@ public class Sit implements ModInitializer { //PACKETS ServerPlayNetworking.registerGlobalReceiver(PacketBuilder.getIdentifier(), (server, player, handler, buf, responseSender) -> { - buf.retain(); + ByteBuf byteBuf = buf.copy(); server.execute(() -> { - PacketBuilder packet = new PacketBuilder(buf); + PacketBuilder packet = new PacketBuilder(byteBuf); Type hashMapToken = new TypeToken>() {}.getType(); Gson gson = new GsonBuilder().disableHtmlEscaping().create(); playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken)); }); - buf.release(); }); } public static MutableText lang(String key, Object... args) { From 70e43c515f5e44cec1fb46decde59f6668f1859b Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 30 Nov 2023 17:58:16 -0600 Subject: [PATCH 8/9] fix? --- src/main/java/one/oth3r/sit/PacketBuilder.java | 7 +++---- src/main/java/one/oth3r/sit/Sit.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/one/oth3r/sit/PacketBuilder.java b/src/main/java/one/oth3r/sit/PacketBuilder.java index ac4bb96..538609d 100644 --- a/src/main/java/one/oth3r/sit/PacketBuilder.java +++ b/src/main/java/one/oth3r/sit/PacketBuilder.java @@ -1,6 +1,5 @@ package one.oth3r.sit; -import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.minecraft.network.PacketByteBuf; @@ -13,10 +12,10 @@ public class PacketBuilder { public static final String SETTINGS = "settings_v1.0"; private final String message; private PacketByteBuf packetByteBuf = PacketByteBufs.create(); - public PacketBuilder(ByteBuf buf) { + public PacketBuilder(PacketByteBuf buf) { // Read any data sent in the packet - packetByteBuf.writeBytes(buf); - message = packetByteBuf.toString(StandardCharsets.UTF_8); + message = buf.toString(StandardCharsets.UTF_8); + packetByteBuf = buf; } public PacketBuilder(String message) { this.message = message; diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index cf985eb..d621a73 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -41,9 +41,8 @@ public class Sit implements ModInitializer { //PACKETS ServerPlayNetworking.registerGlobalReceiver(PacketBuilder.getIdentifier(), (server, player, handler, buf, responseSender) -> { - ByteBuf byteBuf = buf.copy(); + PacketBuilder packet = new PacketBuilder(buf); server.execute(() -> { - PacketBuilder packet = new PacketBuilder(byteBuf); Type hashMapToken = new TypeToken>() {}.getType(); Gson gson = new GsonBuilder().disableHtmlEscaping().create(); playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken)); From fe3a812569c10c3eb6e0eca7f55bf0a0fe2cf2f6 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 5 Dec 2023 13:56:56 -0600 Subject: [PATCH 9/9] fix fix --- src/main/java/one/oth3r/sit/PacketBuilder.java | 7 ++++--- src/main/java/one/oth3r/sit/Sit.java | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/one/oth3r/sit/PacketBuilder.java b/src/main/java/one/oth3r/sit/PacketBuilder.java index 538609d..6afb6cf 100644 --- a/src/main/java/one/oth3r/sit/PacketBuilder.java +++ b/src/main/java/one/oth3r/sit/PacketBuilder.java @@ -1,5 +1,6 @@ package one.oth3r.sit; +import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.minecraft.network.PacketByteBuf; @@ -11,11 +12,11 @@ import java.nio.charset.StandardCharsets; public class PacketBuilder { public static final String SETTINGS = "settings_v1.0"; private final String message; - private PacketByteBuf packetByteBuf = PacketByteBufs.create(); - public PacketBuilder(PacketByteBuf buf) { + private final PacketByteBuf packetByteBuf = PacketByteBufs.create(); + public PacketBuilder(ByteBuf buf) { // Read any data sent in the packet message = buf.toString(StandardCharsets.UTF_8); - packetByteBuf = buf; + packetByteBuf.writeBytes(buf); } public PacketBuilder(String message) { this.message = message; diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index d621a73..08abcc9 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -41,7 +41,8 @@ public class Sit implements ModInitializer { //PACKETS ServerPlayNetworking.registerGlobalReceiver(PacketBuilder.getIdentifier(), (server, player, handler, buf, responseSender) -> { - PacketBuilder packet = new PacketBuilder(buf); + // copy to not throw errors + PacketBuilder packet = new PacketBuilder(buf.copy()); server.execute(() -> { Type hashMapToken = new TypeToken>() {}.getType(); Gson gson = new GsonBuilder().disableHtmlEscaping().create();