Move Easter to Holidays Folder

This moves the easter seasonal features into a more cohesive
holidays/easter folder. Additionally, this splits out earth day into
its own holiday folder.

26 files changed, 10 insertions, 10 deletions

diff --git a/bot/exts/easter/__init__.py b/bot/exts/holidays/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/easter/__init__.py
+++ b/bot/exts/holidays/__init__.py
diff --git a/bot/exts/halloween/__init__.py b/bot/exts/holidays/earth_day/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/halloween/__init__.py
+++ b/bot/exts/holidays/earth_day/__init__.py
diff --git a/bot/exts/easter/save_the_planet.py b/bot/exts/holidays/earth_day/save_the_planet.py
index 1bd515f2..13c84886 100644
--- a/bot/exts/easter/save_the_planet.py
+++ b/bot/exts/holidays/earth_day/save_the_planet.py
@@ -7,7 +7,7 @@ from discord.ext import commands
 from bot.bot import Bot
 from bot.utils.randomization import RandomCycle
 
-EMBED_DATA = RandomCycle(json.loads(Path("bot/resources/easter/save_the_planet.json").read_text("utf8")))
+EMBED_DATA = RandomCycle(json.loads(Path("bot/resources/holidays/earth_day/save_the_planet.json").read_text("utf8")))
 
 
 class SaveThePlanet(commands.Cog):
diff --git a/bot/exts/pride/__init__.py b/bot/exts/holidays/easter/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/pride/__init__.py
+++ b/bot/exts/holidays/easter/__init__.py
diff --git a/bot/exts/easter/april_fools_vids.py b/bot/exts/holidays/easter/april_fools_vids.py
index 5ef40704..ae22f751 100644
--- a/bot/exts/easter/april_fools_vids.py
+++ b/bot/exts/holidays/easter/april_fools_vids.py
@@ -9,7 +9,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-ALL_VIDS = loads(Path("bot/resources/easter/april_fools_vids.json").read_text("utf-8"))
+ALL_VIDS = loads(Path("bot/resources/holidays/easter/april_fools_vids.json").read_text("utf-8"))
 
 
 class AprilFoolVideos(commands.Cog):
diff --git a/bot/exts/easter/bunny_name_generator.py b/bot/exts/holidays/easter/bunny_name_generator.py
index 4c3137de..f767f7c5 100644
--- a/bot/exts/easter/bunny_name_generator.py
+++ b/bot/exts/holidays/easter/bunny_name_generator.py
@@ -11,7 +11,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-BUNNY_NAMES = json.loads(Path("bot/resources/easter/bunny_names.json").read_text("utf8"))
+BUNNY_NAMES = json.loads(Path("bot/resources/holidays/easter/bunny_names.json").read_text("utf8"))
 
 
 class BunnyNameGenerator(commands.Cog):
diff --git a/bot/exts/easter/earth_photos.py b/bot/exts/holidays/easter/earth_photos.py
index f65790af..f65790af 100644
--- a/bot/exts/easter/earth_photos.py
+++ b/bot/exts/holidays/easter/earth_photos.py
diff --git a/bot/exts/easter/easter_riddle.py b/bot/exts/holidays/easter/easter_riddle.py
index 88b3be2f..c9b7fc53 100644
--- a/bot/exts/easter/easter_riddle.py
+++ b/bot/exts/holidays/easter/easter_riddle.py
@@ -12,7 +12,7 @@ from bot.constants import Colours, NEGATIVE_REPLIES
 
 log = logging.getLogger(__name__)
 
-RIDDLE_QUESTIONS = loads(Path("bot/resources/easter/easter_riddle.json").read_text("utf8"))
+RIDDLE_QUESTIONS = loads(Path("bot/resources/holidays/easter/easter_riddle.json").read_text("utf8"))
 
 TIMELIMIT = 10
 
diff --git a/bot/exts/easter/egg_decorating.py b/bot/exts/holidays/easter/egg_decorating.py
index fb5701c4..1db9b347 100644
--- a/bot/exts/easter/egg_decorating.py
+++ b/bot/exts/holidays/easter/egg_decorating.py
@@ -15,9 +15,9 @@ from bot.utils import helpers
 
 log = logging.getLogger(__name__)
 
-HTML_COLOURS = json.loads(Path("bot/resources/evergreen/html_colours.json").read_text("utf8"))
+HTML_COLOURS = json.loads(Path("bot/resources/fun/html_colours.json").read_text("utf8"))
 
-XKCD_COLOURS = json.loads(Path("bot/resources/evergreen/xkcd_colours.json").read_text("utf8"))
+XKCD_COLOURS = json.loads(Path("bot/resources/fun/xkcd_colours.json").read_text("utf8"))
 
 COLOURS = [
     (255, 0, 0, 255), (255, 128, 0, 255), (255, 255, 0, 255), (0, 255, 0, 255),
@@ -80,7 +80,7 @@ class EggDecorating(commands.Cog):
                 q, r = divmod(8, colours_n)
                 colours = colours * q + colours[:r]
             num = random.randint(1, 6)
-            im = Image.open(Path(f"bot/resources/easter/easter_eggs/design{num}.png"))
+            im = Image.open(Path(f"bot/resources/holidays/easter/easter_eggs/design{num}.png"))
             data = list(im.getdata())
 
             replaceable = {x for x in data if x not in IRREPLACEABLE}
diff --git a/bot/exts/easter/egg_facts.py b/bot/exts/holidays/easter/egg_facts.py
index 486e735f..5f216e0d 100644
--- a/bot/exts/easter/egg_facts.py
+++ b/bot/exts/holidays/easter/egg_facts.py
@@ -12,7 +12,7 @@ from bot.utils.decorators import seasonal_task
 
 log = logging.getLogger(__name__)
 
-EGG_FACTS = loads(Path("bot/resources/easter/easter_egg_facts.json").read_text("utf8"))
+EGG_FACTS = loads(Path("bot/resources/holidays/easter/easter_egg_facts.json").read_text("utf8"))
 
 
 class EasterFacts(commands.Cog):
diff --git a/bot/exts/easter/egghead_quiz.py b/bot/exts/holidays/easter/egghead_quiz.py
index ad550567..06229537 100644
--- a/bot/exts/easter/egghead_quiz.py
+++ b/bot/exts/holidays/easter/egghead_quiz.py
@@ -13,7 +13,7 @@ from bot.constants import Colours
 
 log = logging.getLogger(__name__)
 
-EGGHEAD_QUESTIONS = loads(Path("bot/resources/easter/egghead_questions.json").read_text("utf8"))
+EGGHEAD_QUESTIONS = loads(Path("bot/resources/holidays/easter/egghead_questions.json").read_text("utf8"))
 
 
 EMOJIS = [
diff --git a/bot/exts/easter/traditions.py b/bot/exts/holidays/easter/traditions.py
index 93404f3e..f54ab5c4 100644
--- a/bot/exts/easter/traditions.py
+++ b/bot/exts/holidays/easter/traditions.py
@@ -9,7 +9,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-traditions = json.loads(Path("bot/resources/easter/traditions.json").read_text("utf8"))
+traditions = json.loads(Path("bot/resources/holidays/easter/traditions.json").read_text("utf8"))
 
 
 class Traditions(commands.Cog):
diff --git a/bot/resources/easter/save_the_planet.json b/bot/resources/holidays/earth_day/save_the_planet.json
index f22261b7..f22261b7 100644
--- a/bot/resources/easter/save_the_planet.json
+++ b/bot/resources/holidays/earth_day/save_the_planet.json
diff --git a/bot/resources/easter/april_fools_vids.json b/bot/resources/holidays/easter/april_fools_vids.json
index e1e8c70a..e1e8c70a 100644
--- a/bot/resources/easter/april_fools_vids.json
+++ b/bot/resources/holidays/easter/april_fools_vids.json
diff --git a/bot/resources/easter/bunny_names.json b/bot/resources/holidays/easter/bunny_names.json
index 8c97169c..8c97169c 100644
--- a/bot/resources/easter/bunny_names.json
+++ b/bot/resources/holidays/easter/bunny_names.json
diff --git a/bot/resources/easter/chocolate_bunny.png b/bot/resources/holidays/easter/chocolate_bunny.png
index 6b25aa5a..6b25aa5a 100644
--- a/bot/resources/easter/chocolate_bunny.png
+++ b/bot/resources/holidays/easter/chocolate_bunny.png
diff --git a/bot/resources/easter/easter_egg_facts.json b/bot/resources/holidays/easter/easter_egg_facts.json
index b0650b84..b0650b84 100644
--- a/bot/resources/easter/easter_egg_facts.json
+++ b/bot/resources/holidays/easter/easter_egg_facts.json
diff --git a/bot/resources/easter/easter_eggs/design1.png b/bot/resources/holidays/easter/easter_eggs/design1.png
index d887c590..d887c590 100644
--- a/bot/resources/easter/easter_eggs/design1.png
+++ b/bot/resources/holidays/easter/easter_eggs/design1.png
diff --git a/bot/resources/easter/easter_eggs/design2.png b/bot/resources/holidays/easter/easter_eggs/design2.png
index c4fff644..c4fff644 100644
--- a/bot/resources/easter/easter_eggs/design2.png
+++ b/bot/resources/holidays/easter/easter_eggs/design2.png
diff --git a/bot/resources/easter/easter_eggs/design3.png b/bot/resources/holidays/easter/easter_eggs/design3.png
index 803bc1e3..803bc1e3 100644
--- a/bot/resources/easter/easter_eggs/design3.png
+++ b/bot/resources/holidays/easter/easter_eggs/design3.png
diff --git a/bot/resources/easter/easter_eggs/design4.png b/bot/resources/holidays/easter/easter_eggs/design4.png
index 38e6a83f..38e6a83f 100644
--- a/bot/resources/easter/easter_eggs/design4.png
+++ b/bot/resources/holidays/easter/easter_eggs/design4.png
diff --git a/bot/resources/easter/easter_eggs/design5.png b/bot/resources/holidays/easter/easter_eggs/design5.png
index 56662c26..56662c26 100644
--- a/bot/resources/easter/easter_eggs/design5.png
+++ b/bot/resources/holidays/easter/easter_eggs/design5.png
diff --git a/bot/resources/easter/easter_eggs/design6.png b/bot/resources/holidays/easter/easter_eggs/design6.png
index 5372439a..5372439a 100644
--- a/bot/resources/easter/easter_eggs/design6.png
+++ b/bot/resources/holidays/easter/easter_eggs/design6.png
diff --git a/bot/resources/easter/easter_riddle.json b/bot/resources/holidays/easter/easter_riddle.json
index f7eb63d8..f7eb63d8 100644
--- a/bot/resources/easter/easter_riddle.json
+++ b/bot/resources/holidays/easter/easter_riddle.json
diff --git a/bot/resources/easter/egghead_questions.json b/bot/resources/holidays/easter/egghead_questions.json
index 5535f8e0..5535f8e0 100644
--- a/bot/resources/easter/egghead_questions.json
+++ b/bot/resources/holidays/easter/egghead_questions.json
diff --git a/bot/resources/easter/traditions.json b/bot/resources/holidays/easter/traditions.json
index f9dd6d81..f9dd6d81 100644
--- a/bot/resources/easter/traditions.json
+++ b/bot/resources/holidays/easter/traditions.json