Fixed a crash when Depleted Reroll is disabled.

changelog.md

@@ -17,10 +17,13 @@ Initial release
 
 ## 1.1
 - Added a gamerules that allows cartographers to regenerate maps that have been sold at least once.
+- _Regression: Restocks cause a crash if Deplete Reroll is disabled._
 
 # v2
 ## 2.0.0
 - Made some methods and types available through an API.
 - Added an entrypoint to define villager trades from outside mods
 ## 2.1.0
 - 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.

gradle.properties

@@ -12,6 +12,6 @@ loader_version=0.15.3
 fabric_version=0.91.2+1.20.2
 
 # Mod Properties
-mod_version=2.1.0
+mod_version=2.1.1
 maven_group=tk.estecka.shiftingwares
 archives_base_name=shifting-wares

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

@@ -55,7 +55,7 @@ private TradeOfferList DailyRefill(VillagerEntity me, Operation<TradeOfferList>
 		if (IsDailyRerollEnabled() || IsDepleteRerollEnabled())
 			return EMPTY;
 		else
-			return original.call();
+			return original.call(me);
 	}
 
 	/**
@@ -71,7 +71,7 @@ private TradeOfferList RestockReroll(VillagerEntity me, Operation<TradeOfferList
 			return EMPTY;
 		}
 		else
-			return original.call();
+			return original.call(me);
 	}
 
 	/**

src/main/resources/fabric.mod.json

@@ -23,9 +23,10 @@
 		"shifting-wares.mixins.json"
 	],
 	"depends": {
+		"minecraft": "<1.20.5",
 		"fabricloader": ">=0.15.3",
-		"java": ">=17",
-		"fabric-api": "*"
+		"fabric-api": "*",
+		"java": ">=17"
 	},
 	"recommends": {
 		"minecraft": "^1.19.4"