wrap presents on christmas

MehVahdJukaar · Dec 28, 2024 · 75bdbf2 · 75bdbf2
1 parent 7837683
commit 75bdbf2
Show file tree

Hide file tree

Showing 13 changed files with 163 additions and 124 deletions.
diff --git a/...main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/blue_bomb.json b/...main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/blue_bomb.json
@@ -5,19 +5,22 @@
       "type": "supplementaries:flag"
     }
   ],
-  "type": "simple",
-  "max_trades": 3,
-  "price_multiplier": 0.2,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 40
-  },
-  "price_secondary": {
-    "id": "supplementaries:bomb",
-    "Count": 1
-  },
-  "offer": {
-    "id": "supplementaries:bomb_blue",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 3,
+    "price_multiplier": 0.2,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 40
+    },
+    "price_secondary": {
+      "id": "supplementaries:bomb",
+      "Count": 1
+    },
+    "offer": {
+      "id": "supplementaries:bomb_blue",
+      "Count": 1
+    }
   }
 }
diff --git a/.../src/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/bomb.json b/.../src/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/bomb.json
@@ -5,14 +5,17 @@
       "type": "supplementaries:flag"
     }
   ],
-  "type": "simple",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 2
-  },
-  "offer": {
-    "id": "supplementaries:bomb",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 2
+    },
+    "offer": {
+      "id": "supplementaries:bomb",
+      "Count": 1
+    }
   }
 }
diff --git a/...rc/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/cannon.json b/...rc/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/cannon.json
@@ -5,14 +5,17 @@
       "type": "supplementaries:flag"
     }
   ],
-  "type": "simple",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 4
-  },
-  "offer": {
-    "id": "supplementaries:cannon",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 4
+    },
+    "offer": {
+      "id": "supplementaries:cannon",
+      "Count": 1
+    }
   }
 }
diff --git a/...ain/resources/data/supplementaries/moonlight/villager_trades/red_merchant/cannonball.json b/...ain/resources/data/supplementaries/moonlight/villager_trades/red_merchant/cannonball.json
@@ -5,14 +5,17 @@
       "type": "supplementaries:flag"
     }
   ],
-  "type": "simple",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 3
-  },
-  "offer": {
-    "id": "supplementaries:cannonball",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 3
+    },
+    "offer": {
+      "id": "supplementaries:cannonball",
+      "Count": 1
+    }
   }
 }
diff --git a/...resources/data/supplementaries/moonlight/villager_trades/red_merchant/copper_lantern.json b/...resources/data/supplementaries/moonlight/villager_trades/red_merchant/copper_lantern.json
@@ -5,14 +5,17 @@
       "type": "forge:mod_loaded"
     }
   ],
-  "type": "simple",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 1
-  },
-  "offer": {
-    "id": "suppsquared:copper_lantern",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 1
+    },
+    "offer": {
+      "id": "suppsquared:copper_lantern",
+      "Count": 1
+    }
   }
 }
diff --git a/.../resources/data/supplementaries/moonlight/villager_trades/red_merchant/firework_star.json b/.../resources/data/supplementaries/moonlight/villager_trades/red_merchant/firework_star.json
@@ -1,9 +1,12 @@
 {
-  "type": "supplementaries:random_firework_star",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 1
-  },
-  "amount": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "supplementaries:random_firework_star",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 1
+    },
+    "amount": 1
+  }
 }
diff --git a/...main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/gunpowder.json b/...main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/gunpowder.json
@@ -1,12 +1,15 @@
 {
-  "type": "simple",
-  "max_trades": 8,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 1
-  },
-  "offer": {
-    "id": "minecraft:gunpowder",
-    "Count": 2
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 8,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 1
+    },
+    "offer": {
+      "id": "minecraft:gunpowder",
+      "Count": 2
+    }
   }
 }
diff --git a/...c/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/lantern.json b/...c/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/lantern.json
@@ -8,14 +8,17 @@
       }
     }
   ],
-  "type": "simple",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 1
-  },
-  "offer": {
-    "id": "minecraft:lantern",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 1
+    },
+    "offer": {
+      "id": "minecraft:lantern",
+      "Count": 1
+    }
   }
 }
diff --git a/...rc/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/rocket.json b/...rc/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/rocket.json
@@ -1,13 +1,16 @@
 {
-  "type": "supplementaries:random_firework",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 2
-  },
-  "price_secondary": {
-    "id": "minecraft:paper",
-    "Count": 1
-  },
-  "amount": 3
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "supplementaries:random_firework",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 2
+    },
+    "price_secondary": {
+      "id": "minecraft:paper",
+      "Count": 1
+    },
+    "amount": 3
+  }
 }
diff --git a/.../src/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/rope.json b/.../src/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/rope.json
@@ -5,14 +5,17 @@
       "type": "supplementaries:flag"
     }
   ],
-  "type": "simple",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 1
-  },
-  "offer": {
-    "id": "supplementaries:rope",
-    "Count": 4
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 1
+    },
+    "offer": {
+      "id": "supplementaries:rope",
+      "Count": 4
+    }
   }
 }
diff --git a/...ain/resources/data/supplementaries/moonlight/villager_trades/red_merchant/rope_arrow.json b/...ain/resources/data/supplementaries/moonlight/villager_trades/red_merchant/rope_arrow.json
@@ -5,17 +5,20 @@
       "type": "supplementaries:flag"
     }
   ],
-  "type": "simple",
-  "max_trades": 12,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 4
-  },
-  "offer": {
-    "id": "supplementaries:rope_arrow",
-    "Count": 1,
-    "tag": {
-      "Damage": 16
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 12,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 4
+    },
+    "offer": {
+      "id": "supplementaries:rope_arrow",
+      "Count": 1,
+      "tag": {
+        "Damage": 16
+      }
     }
   }
 }
diff --git a/...ain/resources/data/supplementaries/moonlight/villager_trades/red_merchant/spiky_bomb.json b/...ain/resources/data/supplementaries/moonlight/villager_trades/red_merchant/spiky_bomb.json
@@ -9,14 +9,17 @@
       "type": "forge:mod_loaded"
     }
   ],
-  "type": "simple",
-  "max_trades": 3,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 4
-  },
-  "offer": {
-    "id": "supplementaries:bomb_spiky",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 3,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 4
+    },
+    "offer": {
+      "id": "supplementaries:bomb_spiky",
+      "Count": 1
+    }
   }
 }
diff --git a/...n/src/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/tnt.json b/...n/src/main/resources/data/supplementaries/moonlight/villager_trades/red_merchant/tnt.json
@@ -1,12 +1,15 @@
 {
-  "type": "simple",
-  "max_trades": 8,
-  "price": {
-    "id": "minecraft:emerald",
-    "Count": 4
-  },
-  "offer": {
-    "id": "minecraft:tnt",
-    "Count": 1
+  "type": "supplementaries:wrap_on_christmas",
+  "trade": {
+    "type": "simple",
+    "max_trades": 8,
+    "price": {
+      "id": "minecraft:emerald",
+      "Count": 4
+    },
+    "offer": {
+      "id": "minecraft:tnt",
+      "Count": 1
+    }
   }
 }