Merge tag 2.2.2+1.21 into 1.20.5

changelog.md

@@ -28,6 +28,8 @@ Initial release
 - Reimplemented Trade-Rebalance support in a backward-compatible way
 ### 2.1.1
 - Fixed a crash that would occur upon restock if Depleted Reroll is disabled.
+### 2.1.2 (Branched of v2.2)
+- Custom serialization is no longer callable from the render thread.
 ## 2.2
 ### 2.2.0
 - Updated for MC 1.20.5
@@ -36,3 +38,6 @@ Initial release
 - Added custom logic for upgrading caches from before 1.20.5
 ### 2.2.1
 - Updated for MC 1.21
+### 2.2.2
+- Custom serialization is no longer callable from the render thread.
+This boost performances when using Fresh Animations

gradle.properties

@@ -12,6 +12,6 @@ loader_version=0.15.10
 fabric_version=0.97.6+1.20.5
 
 # Mod Properties
-mod_version=2.2.1
+mod_version=2.2.2
 maven_group=tk.estecka.shiftingwares
 archives_base_name=shifting-wares

src/main/java/tk/estecka/shiftingwares/mixin/VillagerEntityMixin.java

@@ -91,14 +91,18 @@ private boolean RestockDepletedOnly(TradeOffer offer, Operation<Boolean> hasBeen
 
 	@Inject ( method="writeCustomDataToNbt", at=@At("TAIL"))
 	void	WriteCachedMapsToNbt(NbtCompound nbt, CallbackInfo info){
-		this.tradeCache.FillCacheFromTrades(villager.getOffers());
-		this.tradeCache.WriteMapCacheToNbt(nbt);
+		if (!villager.getWorld().isClient()){
+			this.tradeCache.FillCacheFromTrades(villager.getOffers());
+			this.tradeCache.WriteMapCacheToNbt(nbt);
+		}
 	}
 
 	@Inject ( method="readCustomDataFromNbt", at=@At("TAIL"))
 	void	ReadCachedMapsFromNbt(NbtCompound nbt, CallbackInfo info){
-		this.tradeCache.ReadMapCacheFromNbt(nbt);
-		this.tradeCache.FillCacheFromTrades(villager.getOffers());
+		if (!villager.getWorld().isClient()){
+			this.tradeCache.ReadMapCacheFromNbt(nbt);
+			this.tradeCache.FillCacheFromTrades(villager.getOffers());
+		}
 	}
 
 }