Merge remote-tracking branch 'origin/1.21.1' into 1.21.4

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_bit_storage/PalettedContainerMixin.java

@@ -30,8 +30,15 @@ private void validateData(FriendlyByteBuf buffer, CallbackInfo ci, int i) {
             }
         }
         if(empty && storArray.length > 0) {
+            T value;
             /* it means the chunk is oversized and wasting memory, take the ID out of the palette and recreate a smaller chunk */
-            T value = this.data.palette().valueFor(0);
+            try {
+                value = this.data.palette().valueFor(0);
+            } catch (RuntimeException e) {
+                // Some mods/servers seem to generate buggy palettes. This is not our fault (the game will likely crash later),
+                // but we catch it here to avoid receiving bug reports for an issue we didn't cause.
+                return;
+            }
             this.data = this.createOrReuseData(null, 0);
             this.data.palette().idFor(value);
         }

common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java

@@ -3,9 +3,12 @@
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
 
+import java.util.concurrent.locks.ReentrantLock;
+
 public interface IExtendedModelBakery {
     void mfix$tick();
     void mfix$finishLoading();
     UnbakedModel mfix$loadUnbakedModelDynamic(ModelResourceLocation location);
     UnbakedModel mfix$getMissingModel();
+    ReentrantLock mfix$getLock();
 }