fix: send side configuration with initial chunk data

Author: marcus8448

build.gradle.kts

@@ -220,7 +220,7 @@ tasks.withType<ProcessResources> {
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
-    options.release.set(17)
+    options.release.set(21)
 }
 
 tasks.withType<Jar> {

src/main/java/dev/galacticraft/machinelib/api/block/entity/BaseBlockEntity.java

@@ -26,8 +26,6 @@
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
@@ -83,12 +81,6 @@ public BlockPos getScreenOpeningData(ServerPlayer player) {
         return this.getBlockPos();
     }
 
-    // we override the update packet to circumvent nbt serialization
-    @Override
-    public final @NotNull CompoundTag getUpdateTag(HolderLookup.Provider registryLookup) {
-        return new CompoundTag();
-    }
-
     @Override
     public final @Nullable Packet<ClientGamePacketListener> getUpdatePacket() {
         CustomPacketPayload payload = this.createUpdatePayload();
@@ -130,8 +122,8 @@ protected void broadcastToPlayers(CustomPacketPayload payload) {
     /**
      * Marks the block entity for re-rendering.
      */
-    public void markForRerender() {
-        if (this.level != null) {
+    public void requestRerender() {
+        if (this.level != null && this.level.isClientSide) {
             this.level.sendBlockUpdated(this.worldPosition, this.getBlockState(), this.getBlockState(), 0);
         }
     }

src/main/java/dev/galacticraft/machinelib/api/block/entity/ConfiguredBlockEntity.java

@@ -278,6 +278,13 @@ public void loadAdditional(CompoundTag tag, HolderLookup.Provider lookup) {
         return this.configuration;
     }
 
+    @Override
+    public @NotNull CompoundTag getUpdateTag(HolderLookup.Provider registryLookup) {
+        CompoundTag tag = super.getUpdateTag(registryLookup);
+        tag.put(Constant.Nbt.CONFIGURATION, this.configuration.createTag());
+        return tag;
+    }
+
     @Override
     public @NotNull CustomPacketPayload createUpdatePayload() {
         return new BaseMachineUpdatePayload(this.worldPosition, this.configuration);
@@ -351,9 +358,8 @@ public void setOption(@NotNull ResourceType type, @NotNull ResourceFlow flow) {
                 this.flow = flow;
 
                 ConfiguredBlockEntity.this.setChanged();
-                if (ConfiguredBlockEntity.this.level.isClientSide) {
-                    ConfiguredBlockEntity.this.markForRerender();
-                } else {
+                ConfiguredBlockEntity.this.requestRerender();
+                if (ConfiguredBlockEntity.this.level != null && !ConfiguredBlockEntity.this.level.isClientSide) {
                     ConfiguredBlockEntity.this.broadcastToPlayers(new SideConfigurationUpdatePayload(ConfiguredBlockEntity.this.worldPosition, this.face, type, flow));
                 }
             }

src/main/java/dev/galacticraft/machinelib/impl/network/s2c/BaseMachineUpdatePayload.java

@@ -53,7 +53,7 @@ public void apply(ClientPlayNetworking.Context context) {
         if (level != null && level.getBlockEntity(pos) instanceof MachineBlockEntity machine) {
             this.config.copyInto(machine.getIOConfig());
             machine.setChanged();
-            machine.markForRerender();
+            machine.requestRerender();
         }
     }
 }