Rename methods in wanderer trading event

AlmostReliable · Nov 8, 2024 · 1ae2461 · 1ae2461
1 parent 5efa428
commit 1ae2461
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
 ## Unreleased
-- /
+
+- Rename methods in wanderer trading event to match villager trading event
 
 ## [0.14.0] - 2024-10-31
 

diff --git a/src/main/java/com/almostreliable/morejs/features/villager/events/WandererTradingEventJS.java b/src/main/java/com/almostreliable/morejs/features/villager/events/WandererTradingEventJS.java
@@ -65,26 +65,50 @@ public void removeTrades(TradeFilter filter) {
         });
     }
 
-    public void removeVanillaTrades() {
+    public void removeVanillaTypedTrades() {
         getTrades(1).removeIf(VillagerUtils::isVanillaTypedTrade);
         getTrades(2).removeIf(VillagerUtils::isVanillaTypedTrade);
     }
 
-    public void removeVanillaTrades(int level) {
+    @Deprecated(forRemoval = true)
+    public void removeVanillaTrades() {
+        ConsoleJS.SERVER.error("removeVanillaTrades is deprecated, use removeVanillaTypedTrades instead");
+        removeVanillaTypedTrades();
+    }
+
+    public void removeVanillaTypedTrades(int level) {
         checkLevel(level);
         getTrades(level).removeIf(VillagerUtils::isVanillaTypedTrade);
     }
 
-    public void removeModdedTrades() {
+    @Deprecated(forRemoval = true)
+    public void removeVanillaTrades(int level) {
+        ConsoleJS.SERVER.error("removeVanillaTrades is deprecated, use removeVanillaTypedTrades instead");
+        removeVanillaTypedTrades(level);
+    }
+
+    public void removeModdedTypedTrades() {
         getTrades(1).removeIf(VillagerUtils::isModdedTypedTrade);
         getTrades(2).removeIf(VillagerUtils::isModdedTypedTrade);
     }
 
-    public void removeModdedTrades(int level) {
+    @Deprecated(forRemoval = true)
+    public void removeModdedTrades() {
+        ConsoleJS.SERVER.error("removeModdedTrades is deprecated, use removeModdedTypedTrades instead");
+        removeModdedTypedTrades();
+    }
+
+    public void removeModdedTypedTrades(int level) {
         checkLevel(level);
         getTrades(level).removeIf(VillagerUtils::isModdedTypedTrade);
     }
 
+    @Deprecated(forRemoval = true)
+    public void removeModdedTrades(int level) {
+        ConsoleJS.SERVER.error("removeModdedTrades is deprecated, use removeModdedTypedTrades instead");
+        removeModdedTypedTrades(level);
+    }
+
     private void checkLevel(int level) {
         Preconditions.checkArgument(1 <= level && level <= 2, "Level must be between 1 and 2");
     }