icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #720 from gnembon/fix_for_712

Browse Source 
Fix for 712
This commit is contained in:
gnembon authored and GitHub committed 2021-02-16 23:26:01 -04:00
2 parents 0e0a4cc0f2 df7a4a6681
commit f9d9c01558
2 files changed
+14 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/CarpetSettings.java
+1 -1
View File
@@ -819,7 +819,7 @@ public class CarpetSettings
"'structureBlockOutlineDistance' may be required for", "'structureBlockOutlineDistance' may be required for",
"correct rendering of long structures."}, "correct rendering of long structures."},
options = {"48", "96", "192", "256"}, options = {"48", "96", "192", "256"},
category = {CREATIVE, CLIENT}, category = CREATIVE,
validate = StructureBlockLimitValidator.class, validate = StructureBlockLimitValidator.class,
strict = false strict = false
) )
src/main/java/carpet/mixins/UpdateStructureBlockC2SPacketMixin.java
+13 -7
View File
@@ -1,6 +1,8 @@
package carpet.mixins; package carpet.mixins;
import carpet.CarpetServer;
import carpet.CarpetSettings; import carpet.CarpetSettings;
import carpet.network.CarpetClient;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.c2s.play.UpdateStructureBlockC2SPacket; import net.minecraft.network.packet.c2s.play.UpdateStructureBlockC2SPacket;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -23,7 +25,7 @@ public class UpdateStructureBlockC2SPacketMixin {
at = @At("TAIL") at = @At("TAIL")
) )
private void structureBlockLimitsRead(PacketByteBuf buf, CallbackInfo ci) { private void structureBlockLimitsRead(PacketByteBuf buf, CallbackInfo ci) {
if (buf.readableBytes() > 0) { if (buf.readableBytes() == 6*4) {
// This will throw an exception if carpet is not installed on client // This will throw an exception if carpet is not installed on client
offset = new BlockPos(MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit)); offset = new BlockPos(MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), -CarpetSettings.structureBlockLimit, CarpetSettings.structureBlockLimit));
size = new BlockPos(MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit)); size = new BlockPos(MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit), MathHelper.clamp(buf.readInt(), 0, CarpetSettings.structureBlockLimit));
@@ -35,11 +37,15 @@ public class UpdateStructureBlockC2SPacketMixin {
at = @At("TAIL") at = @At("TAIL")
) )
private void structureBlockLimitsWrite(PacketByteBuf buf, CallbackInfo ci) { private void structureBlockLimitsWrite(PacketByteBuf buf, CallbackInfo ci) {
buf.writeInt(this.offset.getX()); //client method, only applicable if with carpet is on the server, or running locally
buf.writeInt(this.offset.getY()); if (CarpetSettings.structureBlockLimit >= 128)
buf.writeInt(this.offset.getZ()); {
buf.writeInt(this.size.getX()); buf.writeInt(this.offset.getX());
buf.writeInt(this.size.getY()); buf.writeInt(this.offset.getY());
buf.writeInt(this.size.getZ()); buf.writeInt(this.offset.getZ());
buf.writeInt(this.size.getX());
buf.writeInt(this.size.getY());
buf.writeInt(this.size.getZ());
}
} }
} }