From e02a1017483b58ffe0fec562446f000cf6837da2 Mon Sep 17 00:00:00 2001
From: HuskyDreaming <huskydevelopment@gmail.com>
Date: Thu, 31 Oct 2024 16:49:58 +1300
Subject: [PATCH] Version 7.0

- Added Configurable Blocks that bouncy balls can bounce on
- Added New Improved Husky Core
- Updated the Edit BouncyBall Menu
- Improved the commands
- Improved the particle system
- Improved the projectile System
- Did a bug recode of the plugin
---
 .idea/compiler.xml                            |   2 +-
 .idea/jarRepositories.xml                     |  10 ++
 .idea/misc.xml                                |   2 +-
 .idea/modules.xml                             |   8 ++
 Bouncyballs.iml                               |  13 ++
 dependency-reduced-pom.xml                    |   7 +-
 pom.xml                                       |  24 ++--
 .../bouncyball/BouncyBallPlugin.java          |  59 ++++----
 .../bouncyball/commands/BaseCommand.java      |  43 +++---
 .../commands/subcommands/CreateCommand.java   |  54 +++----
 .../commands/subcommands/GiveCommand.java     |  45 +++---
 .../commands/subcommands/ReloadCommand.java   |  54 +++----
 .../data/particles/ParticleData.java          |   4 +
 .../{pareseables => enumerations}/Locale.java |  22 +--
 .../{pareseables => enumerations}/Menu.java   |  54 +++----
 .../InventoryHandlerImpl.java}                |  64 ++++++---
 .../LocalizationHandlerImpl.java}             |  15 +-
 .../implementations/ParticleHandlerImpl.java  |  43 ++++++
 .../ProjectileHandlerImpl.java}               | 134 ++++++------------
 .../interfaces/InventoryHandler.java}         |   9 +-
 .../interfaces/LocalizationHandler.java       |  11 ++
 .../handlers/interfaces/ParticleHandler.java  |   7 +
 .../interfaces/ProjectileHandler.java}        |  34 ++---
 .../inventories/ColorInventory.java           |  21 ++-
 .../bouncyball/inventories/EditInventory.java |  65 +++++----
 .../bouncyball/inventories/MainInventory.java |  32 +++--
 .../inventories/MaterialInventory.java        |  65 ++++++---
 .../inventories/ParticleInventory.java        |  35 ++---
 .../listeners/ProjectileListener.java         |  32 ++---
 .../ParticleRepositoryImpl.java               |  93 ++++++++++++
 .../ProjectileRepositoryImpl.java             | 127 +++++++++++++++++
 .../interfaces/ParticleRepository.java        |  11 ++
 .../interfaces/ProjectileRepository.java      |  19 +++
 .../implementations/ParticleServiceImpl.java  |  79 -----------
 .../services/interfaces/LocaleService.java    |  11 --
 .../services/interfaces/ParticleService.java  |  14 --
 src/main/resources/plugin.yml                 |   2 +-
 37 files changed, 789 insertions(+), 535 deletions(-)
 create mode 100644 .idea/modules.xml
 create mode 100644 Bouncyballs.iml
 rename src/main/java/com/huskydreaming/bouncyball/{pareseables => enumerations}/Locale.java (74%)
 rename src/main/java/com/huskydreaming/bouncyball/{pareseables => enumerations}/Menu.java (55%)
 rename src/main/java/com/huskydreaming/bouncyball/{services/implementations/InventoryServiceImpl.java => handlers/implementations/InventoryHandlerImpl.java} (62%)
 rename src/main/java/com/huskydreaming/bouncyball/{services/implementations/LocaleServiceImpl.java => handlers/implementations/LocalizationHandlerImpl.java} (74%)
 create mode 100644 src/main/java/com/huskydreaming/bouncyball/handlers/implementations/ParticleHandlerImpl.java
 rename src/main/java/com/huskydreaming/bouncyball/{services/implementations/ProjectileServiceImpl.java => handlers/implementations/ProjectileHandlerImpl.java} (79%)
 rename src/main/java/com/huskydreaming/bouncyball/{services/interfaces/InventoryService.java => handlers/interfaces/InventoryHandler.java} (65%)
 create mode 100644 src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/LocalizationHandler.java
 create mode 100644 src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/ParticleHandler.java
 rename src/main/java/com/huskydreaming/bouncyball/{services/interfaces/ProjectileService.java => handlers/interfaces/ProjectileHandler.java} (72%)
 create mode 100644 src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ParticleRepositoryImpl.java
 create mode 100644 src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ProjectileRepositoryImpl.java
 create mode 100644 src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ParticleRepository.java
 create mode 100644 src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ProjectileRepository.java
 delete mode 100644 src/main/java/com/huskydreaming/bouncyball/services/implementations/ParticleServiceImpl.java
 delete mode 100644 src/main/java/com/huskydreaming/bouncyball/services/interfaces/LocaleService.java
 delete mode 100644 src/main/java/com/huskydreaming/bouncyball/services/interfaces/ParticleService.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1e5427c..5fa805e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,7 +6,7 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="BouncySnowballs" />
+        <module name="Bouncyballs" />
       </profile>
     </annotationProcessing>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 0469cab..9920ebf 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,6 +11,11 @@
       <option name="name" value="spigot-repo" />
       <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="github" />
+      <option name="name" value="github" />
+      <option name="url" value="https://maven.pkg.github.com/huskydreaming/huskycore" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -21,6 +26,11 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="central" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="papermc" />
       <option name="name" value="papermc" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a10df0..fdc35ea 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..223ff14
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Bouncyballs.iml" filepath="$PROJECT_DIR$/Bouncyballs.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Bouncyballs.iml b/Bouncyballs.iml
new file mode 100644
index 0000000..a589521
--- /dev/null
+++ b/Bouncyballs.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+        <projectReimportVersion>1</projectReimportVersion>
+      </configuration>
+    </facet>
+  </component>
+</module>
\ No newline at end of file
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 5162451..ddf2f11 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.huskydreaming</groupId>
   <artifactId>Bouncyballs</artifactId>
-  <version>6.4-RELEASE</version>
+  <version>6.5-RELEASE</version>
   <build>
     <resources>
       <resource>
@@ -41,6 +41,11 @@
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
     </repository>
+    <repository>
+      <snapshots />
+      <id>github</id>
+      <url>https://maven.pkg.github.com/huskydreaming/huskycore</url>
+    </repository>
   </repositories>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 1bff5ea..7e75d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.huskydreaming</groupId>
     <artifactId>Bouncyballs</artifactId>
-    <version>6.4-RELEASE</version>
+    <version>7.0-RELEASE</version>
 
     <properties>
         <minecraft.version>1.20.4-R0.1-SNAPSHOT</minecraft.version>
@@ -55,6 +55,13 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/huskydreaming/huskycore</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -65,21 +72,10 @@
             <version>${minecraft.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.huskydreaming</groupId>
-            <artifactId>HuskyCore</artifactId>
-            <version>1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>fr.minuskube.inv</groupId>
-            <artifactId>smart-invs</artifactId>
-            <version>1.2.7</version>
+            <artifactId>huskycore</artifactId>
+            <version>1.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/BouncyBallPlugin.java b/src/main/java/com/huskydreaming/bouncyball/BouncyBallPlugin.java
index 426d25f..f23b031 100644
--- a/src/main/java/com/huskydreaming/bouncyball/BouncyBallPlugin.java
+++ b/src/main/java/com/huskydreaming/bouncyball/BouncyBallPlugin.java
@@ -4,43 +4,46 @@
 import com.huskydreaming.bouncyball.commands.subcommands.CreateCommand;
 import com.huskydreaming.bouncyball.commands.subcommands.GiveCommand;
 import com.huskydreaming.bouncyball.commands.subcommands.ReloadCommand;
+import com.huskydreaming.bouncyball.handlers.implementations.InventoryHandlerImpl;
+import com.huskydreaming.bouncyball.handlers.implementations.LocalizationHandlerImpl;
+import com.huskydreaming.bouncyball.handlers.implementations.ParticleHandlerImpl;
+import com.huskydreaming.bouncyball.handlers.implementations.ProjectileHandlerImpl;
+import com.huskydreaming.bouncyball.handlers.interfaces.InventoryHandler;
+import com.huskydreaming.bouncyball.handlers.interfaces.LocalizationHandler;
+import com.huskydreaming.bouncyball.handlers.interfaces.ParticleHandler;
+import com.huskydreaming.bouncyball.handlers.interfaces.ProjectileHandler;
 import com.huskydreaming.bouncyball.listeners.ProjectileListener;
-import com.huskydreaming.bouncyball.services.implementations.InventoryServiceImpl;
-import com.huskydreaming.bouncyball.services.implementations.LocaleServiceImpl;
-import com.huskydreaming.bouncyball.services.implementations.ParticleServiceImpl;
-import com.huskydreaming.bouncyball.services.implementations.ProjectileServiceImpl;
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.LocaleService;
-import com.huskydreaming.bouncyball.services.interfaces.ParticleService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
+import com.huskydreaming.bouncyball.repositories.implementations.ParticleRepositoryImpl;
+import com.huskydreaming.bouncyball.repositories.implementations.ProjectileRepositoryImpl;
+import com.huskydreaming.bouncyball.repositories.interfaces.ParticleRepository;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
+import com.huskydreaming.huskycore.handlers.implementations.DefaultConfigHandlerImpl;
+import com.huskydreaming.huskycore.handlers.interfaces.CommandHandler;
+import com.huskydreaming.huskycore.handlers.interfaces.DefaultConfigHandler;
 
 public class BouncyBallPlugin extends HuskyPlugin {
 
     @Override
-    public void onEnable() {
-        super.onEnable();
+    public void onInitialize() {
+        handlerRegistry.register(DefaultConfigHandler.class, new DefaultConfigHandlerImpl());
+        handlerRegistry.register(LocalizationHandler.class, new LocalizationHandlerImpl());
+        handlerRegistry.register(InventoryHandler.class, new InventoryHandlerImpl());
+        handlerRegistry.register(ParticleHandler.class, new ParticleHandlerImpl());
+        handlerRegistry.register(ProjectileHandler.class, new ProjectileHandlerImpl());
 
-        // Register Services
-        serviceRegistry.register(LocaleService.class, new LocaleServiceImpl());
-        serviceRegistry.register(InventoryService.class, new InventoryServiceImpl());
-        serviceRegistry.register(ProjectileService.class, new ProjectileServiceImpl());
-        serviceRegistry.register(ParticleService.class, new ParticleServiceImpl(this));
-        serviceRegistry.deserialize(this);
-        serviceRegistry.provide(ParticleService.class).run(this);
-
-        // Register Commands
-        commandRegistry.setCommandExecutor(new BaseCommand(this));
-        commandRegistry.add(new CreateCommand(this));
-        commandRegistry.add(new GiveCommand(this));
-        commandRegistry.add(new ReloadCommand(this));
-        commandRegistry.deserialize(this);
-
-        registerListeners(new ProjectileListener(this));
+        repositoryRegistry.register(ParticleRepository.class, new ParticleRepositoryImpl());
+        repositoryRegistry.register(ProjectileRepository.class, new ProjectileRepositoryImpl());
     }
 
     @Override
-    public void onDisable() {
-        serviceRegistry.serialize(this);
+    public void onPostInitialize() {
+        CommandHandler commandHandler = handlerRegistry.provide(CommandHandler.class);
+        commandHandler.setCommandExecutor(new BaseCommand(this));
+        commandHandler.add(new CreateCommand(this));
+        commandHandler.add(new GiveCommand(this));
+        commandHandler.add(new ReloadCommand(this));
+
+        registerListeners(new ProjectileListener(this));
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/commands/BaseCommand.java b/src/main/java/com/huskydreaming/bouncyball/commands/BaseCommand.java
index e6325e4..fcd5369 100644
--- a/src/main/java/com/huskydreaming/bouncyball/commands/BaseCommand.java
+++ b/src/main/java/com/huskydreaming/bouncyball/commands/BaseCommand.java
@@ -1,38 +1,49 @@
 package com.huskydreaming.bouncyball.commands;
 
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.pareseables.Locale;
+import com.huskydreaming.bouncyball.handlers.interfaces.InventoryHandler;
+import com.huskydreaming.bouncyball.enumerations.Locale;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.commands.AbstractCommand;
-import com.huskydreaming.huskycore.interfaces.Parseable;
+import com.huskydreaming.huskycore.commands.abstraction.AbstractCommand;
+import com.huskydreaming.huskycore.commands.annotations.CommandAnnotation;
+import com.huskydreaming.huskycore.utilities.general.Parseable;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@CommandAnnotation(label = "bouncyballs")
 public class BaseCommand extends AbstractCommand {
 
     private final HuskyPlugin plugin;
-    private final InventoryService inventoryService;
-    private final ProjectileService projectileService;
+    private final InventoryHandler inventoryHandler;
+    private final ProjectileRepository projectileRepository;
 
     public BaseCommand(HuskyPlugin plugin) {
-        super("bouncyballs", plugin);
-
+        super(plugin);
         this.plugin = plugin;
-        this.inventoryService = plugin.provide(InventoryService.class);
-        this.projectileService = plugin.provide(ProjectileService.class);
+        this.inventoryHandler = plugin.provide(InventoryHandler.class);
+        this.projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
     @Override
-    public void run(Player player, String[] strings) {
-        if (projectileService.getProjectileDataMap().isEmpty()) {
-            player.sendMessage(Locale.NO_BOUNCY_BALLS.prefix());
+    public void onCommand(CommandSender commandSender, String[] strings) {
+        if(commandSender instanceof Player player) {
+            if (projectileRepository.getProjectileDataMap().isEmpty()) {
+                player.sendMessage(Locale.NO_BOUNCY_BALLS.prefix());
+            } else {
+                inventoryHandler.getBouncyBallsInventory(plugin).open(player);
+            }
         } else {
-            inventoryService.getBouncyBallsInventory(plugin).open(player);
+            commandSender.sendMessage("You must be a player to run this command");
         }
     }
 
     @Override
-    public Parseable getPermissionsLocale() {
+    public Parseable getUsage() {
+        return Locale.USAGE;
+    }
+
+    @Override
+    public Parseable getPermission() {
         return Locale.NO_PERMISSIONS;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/CreateCommand.java b/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/CreateCommand.java
index e4a7dd4..98b66bd 100644
--- a/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/CreateCommand.java
+++ b/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/CreateCommand.java
@@ -1,57 +1,39 @@
 package com.huskydreaming.bouncyball.commands.subcommands;
 
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileDefault;
-import com.huskydreaming.bouncyball.services.interfaces.ParticleService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.pareseables.Locale;
+import com.huskydreaming.bouncyball.enumerations.Locale;
+import com.huskydreaming.bouncyball.repositories.interfaces.ParticleRepository;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.commands.Command;
-import com.huskydreaming.huskycore.commands.SubCommand;
-import org.bukkit.command.ConsoleCommandSender;
+import com.huskydreaming.huskycore.commands.annotations.CommandAnnotation;
+import com.huskydreaming.huskycore.commands.providers.PlayerCommandProvider;
 import org.bukkit.entity.Player;
 
-@Command(label = "create")
-public class CreateCommand implements SubCommand {
+@CommandAnnotation(label = "create")
+public class CreateCommand implements PlayerCommandProvider {
 
-    private final ParticleService particleService;
-    private final ProjectileService projectileService;
+    private final ParticleRepository particleRepository;
+    private final ProjectileRepository projectileRepository;
 
     public CreateCommand(HuskyPlugin plugin) {
-        this.particleService = plugin.provide(ParticleService.class);
-        this.projectileService = plugin.provide(ProjectileService.class);
+        this.particleRepository = plugin.provide(ParticleRepository.class);
+        this.projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
     @Override
-    public void run(Player player, String[] strings) {
+    public void onCommand(Player player, String[] strings) {
         if (strings.length == 2) {
-            String string = strings[1].toLowerCase();
-            if (projectileService.containKey(string.toLowerCase())) {
-                player.sendMessage(Locale.BOUNCY_BALL_EXISTS.prefix(string));
+            String projectileName = strings[1].toLowerCase();
+            if (projectileRepository.hasProjectileData(projectileName)) {
+                player.sendMessage(Locale.BOUNCY_BALL_EXISTS.prefix(projectileName));
                 return;
             }
 
             ProjectileDefault projectileDefault = ProjectileDefault.DEFAULT;
-            particleService.addParticle(string, projectileDefault.getParticleData());
-            projectileService.addProjectile(string, projectileDefault.getProjectileData());
+            particleRepository.addParticleData(projectileName, projectileDefault.getParticleData());
+            projectileRepository.addProjectileData(projectileName, projectileDefault.getProjectileData());
 
-            player.sendMessage(Locale.BOUNCY_BALL_CREATE.prefix(string));
-        }
-    }
-
-    @Override
-    public void run(ConsoleCommandSender sender, String[] strings) {
-        if (strings.length == 2) {
-            String string = strings[1].toLowerCase();
-            if (projectileService.containKey(string.toLowerCase())) {
-                sender.sendMessage(Locale.BOUNCY_BALL_EXISTS.prefix(string));
-                return;
-            }
-
-            ProjectileDefault projectileDefault = ProjectileDefault.DEFAULT;
-            particleService.addParticle(string, projectileDefault.getParticleData());
-            projectileService.addProjectile(string, projectileDefault.getProjectileData());
-
-            sender.sendMessage(Locale.BOUNCY_BALL_CREATE.prefix(string));
+            player.sendMessage(Locale.BOUNCY_BALL_CREATE.prefix(projectileName));
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/GiveCommand.java b/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/GiveCommand.java
index 644e2b3..29154cb 100644
--- a/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/GiveCommand.java
+++ b/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/GiveCommand.java
@@ -1,10 +1,11 @@
 package com.huskydreaming.bouncyball.commands.subcommands;
 
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.pareseables.Locale;
+import com.huskydreaming.bouncyball.handlers.interfaces.ProjectileHandler;
+import com.huskydreaming.bouncyball.enumerations.Locale;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.commands.Command;
-import com.huskydreaming.huskycore.commands.SubCommand;
+import com.huskydreaming.huskycore.commands.annotations.CommandAnnotation;
+import com.huskydreaming.huskycore.commands.providers.PlayerCommandProvider;
 import com.huskydreaming.huskycore.utilities.Util;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -13,18 +14,19 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Command(label = "give")
-public class GiveCommand implements SubCommand {
+@CommandAnnotation(label = "give")
+public class GiveCommand implements PlayerCommandProvider {
 
-    private final ProjectileService projectileService;
+    private final ProjectileHandler projectileHandler;
+    private final ProjectileRepository projectileRepository;
 
     public GiveCommand(HuskyPlugin plugin) {
-        this.projectileService = plugin.provide(ProjectileService.class);
+        this.projectileHandler = plugin.provide(ProjectileHandler.class);
+        this.projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
-
     @Override
-    public void run(Player player, String[] strings) {
+    public void onCommand(Player player, String[] strings) {
         if (strings.length == 3) {
             Player target = Bukkit.getPlayer(strings[1]);
             if (target == null) {
@@ -32,12 +34,13 @@ public void run(Player player, String[] strings) {
                 return;
             }
 
-            if (projectileService.containKey(strings[2])) {
-                ItemStack itemStack = projectileService.getItemStackFromKey(strings[2]);
+            String projectileName = strings[2];
+            if (projectileRepository.hasProjectileData(projectileName)) {
+                ItemStack itemStack = projectileHandler.getItemStackFromKey(projectileName);
                 player.getInventory().addItem(itemStack);
-                player.sendMessage(Locale.BOUNCY_BALL_GIVE.prefix(strings[2].toLowerCase()));
+                player.sendMessage(Locale.BOUNCY_BALL_GIVE.prefix(projectileName.toLowerCase()));
             } else {
-                player.sendMessage(Locale.BOUNCY_BALL_NULL.prefix(strings[2]));
+                player.sendMessage(Locale.BOUNCY_BALL_NULL.prefix(projectileName));
             }
         }
 
@@ -53,21 +56,23 @@ public void run(Player player, String[] strings) {
                 return;
             }
 
-            if (projectileService.containKey(strings[2])) {
-                ItemStack itemStack = projectileService.getItemStackFromKey(strings[2]);
+            String projectileName = strings[2];
+            if (projectileRepository.hasProjectileData(projectileName)) {
+                ItemStack itemStack = projectileHandler.getItemStackFromKey(projectileName);
                 itemStack.setAmount(Integer.parseInt(strings[3]));
                 player.getInventory().addItem(itemStack);
-                player.sendMessage(Locale.BOUNCY_BALL_GIVE.prefix(strings[2].toLowerCase()));
+                player.sendMessage(Locale.BOUNCY_BALL_GIVE.prefix(projectileName.toLowerCase()));
             } else {
-                player.sendMessage(Locale.BOUNCY_BALL_NULL.prefix(strings[1]));
+                player.sendMessage(Locale.BOUNCY_BALL_NULL.prefix(projectileName));
             }
         }
     }
 
     @Override
     public List<String> onTabComplete(Player player, String[] strings) {
-        if (strings.length == 2) return Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
-        if (strings.length == 3) return projectileService.getProjectileDataMap().keySet().stream().toList();
+        if (strings.length == 2)
+            return Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
+        if (strings.length == 3) return projectileRepository.getProjectileDataMap().keySet().stream().toList();
         return List.of();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/ReloadCommand.java b/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/ReloadCommand.java
index 26e0576..8221ee2 100644
--- a/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/ReloadCommand.java
+++ b/src/main/java/com/huskydreaming/bouncyball/commands/subcommands/ReloadCommand.java
@@ -1,50 +1,38 @@
 package com.huskydreaming.bouncyball.commands.subcommands;
 
-import com.huskydreaming.bouncyball.services.interfaces.LocaleService;
-import com.huskydreaming.bouncyball.services.interfaces.ParticleService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.pareseables.Locale;
+import com.huskydreaming.bouncyball.handlers.interfaces.LocalizationHandler;
+import com.huskydreaming.bouncyball.enumerations.Locale;
+import com.huskydreaming.bouncyball.repositories.interfaces.ParticleRepository;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.commands.Command;
-import com.huskydreaming.huskycore.commands.SubCommand;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.entity.Player;
+import com.huskydreaming.huskycore.commands.annotations.CommandAnnotation;
+import com.huskydreaming.huskycore.commands.providers.CommandProvider;
+import org.bukkit.command.CommandSender;
 
-@Command(label = "reload")
-public class ReloadCommand implements SubCommand {
+@CommandAnnotation(label = "reload")
+public class ReloadCommand implements CommandProvider {
 
     private final HuskyPlugin plugin;
-    private final LocaleService localeService;
-    private final ParticleService particleService;
-    private final ProjectileService projectileService;
+    private final LocalizationHandler localizationHandler;
+    private final ParticleRepository particleRepository;
+    private final ProjectileRepository projectileRepository;
 
     public ReloadCommand(HuskyPlugin plugin) {
         this.plugin = plugin;
 
-        this.localeService = plugin.provide(LocaleService.class);
-        this.particleService = plugin.provide(ParticleService.class);
-        this.projectileService = plugin.provide(ProjectileService.class);
+        this.localizationHandler = plugin.provide(LocalizationHandler.class);
+        this.particleRepository = plugin.provide(ParticleRepository.class);
+        this.projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
     @Override
-    public void run(Player player, String[] strings) {
-        localeService.getLocale().reload(plugin);
-        localeService.getMenu().reload(plugin);
+    public void onCommand(CommandSender commandSender, String[] strings) {
+        localizationHandler.getLocale().reload(plugin);
+        localizationHandler.getMenu().reload(plugin);
 
-        particleService.serialize(plugin);
-        projectileService.serialize(plugin);
+        particleRepository.postDeserialize(plugin);
+        projectileRepository.postDeserialize(plugin);
 
-        player.sendMessage(Locale.RELOAD.prefix());
-    }
-
-    @Override
-    public void run(ConsoleCommandSender sender, String[] strings) {
-        localeService.getLocale().reload(plugin);
-        localeService.getMenu().reload(plugin);
-
-        particleService.serialize(plugin);
-        projectileService.serialize(plugin);
-
-        sender.sendMessage(Locale.RELOAD.prefix());
+        commandSender.sendMessage(Locale.RELOAD.prefix());
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/data/particles/ParticleData.java b/src/main/java/com/huskydreaming/bouncyball/data/particles/ParticleData.java
index ca604ae..88f53d4 100644
--- a/src/main/java/com/huskydreaming/bouncyball/data/particles/ParticleData.java
+++ b/src/main/java/com/huskydreaming/bouncyball/data/particles/ParticleData.java
@@ -17,6 +17,10 @@ public static ParticleData create(Particle particle, Color color) {
         return new ParticleData(particle, color);
     }
 
+    public ParticleData() {
+
+    }
+
     public ParticleData(Particle particle, Color color) {
         this.particle = particle;
         this.color = color;
diff --git a/src/main/java/com/huskydreaming/bouncyball/pareseables/Locale.java b/src/main/java/com/huskydreaming/bouncyball/enumerations/Locale.java
similarity index 74%
rename from src/main/java/com/huskydreaming/bouncyball/pareseables/Locale.java
rename to src/main/java/com/huskydreaming/bouncyball/enumerations/Locale.java
index f79a0a1..fbcf230 100644
--- a/src/main/java/com/huskydreaming/bouncyball/pareseables/Locale.java
+++ b/src/main/java/com/huskydreaming/bouncyball/enumerations/Locale.java
@@ -1,6 +1,7 @@
-package com.huskydreaming.bouncyball.pareseables;
+package com.huskydreaming.bouncyball.enumerations;
+
 import com.google.common.base.Functions;
-import com.huskydreaming.huskycore.interfaces.Parseable;
+import com.huskydreaming.huskycore.utilities.general.Parseable;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.jetbrains.annotations.NotNull;
@@ -11,19 +12,20 @@
 
 public enum Locale implements Parseable {
     PREFIX("&aBouncyballs: &7"),
-    BOUNCY_BALL_CREATE("You have created the &b{0}&7 bouncy ball."),
-    BOUNCY_BALL_EXISTS("The bouncy ball &b{0} &7 already exists."),
-    BOUNCY_BALL_NULL("The &b{0}&7 bouncy ball does not seem to exist."),
-    BOUNCY_BALL_GIVE("You have been given the &b{0}&7 bouncy ball."),
-    BOUNCY_BALL_GIVE_AMOUNT("You have been given &ex{0} {1}&7 bouncy ball(s)."),
-    BOUNCY_BALL_SEND("You have given &a{0} &7a {1}&7 bouncy ball."),
-    BOUNCY_BALL_SEND_AMOUNT("You have given &a{0} &ex{1} {2}&7 bouncy ball(s)."),
+    BOUNCY_BALL_CREATE("You have created the &b<0>&7 bouncy ball."),
+    BOUNCY_BALL_EXISTS("The bouncy ball &b<0> &7 already exists."),
+    BOUNCY_BALL_NULL("The &b<0>&7 bouncy ball does not seem to exist."),
+    BOUNCY_BALL_GIVE("You have been given the &b<0>&7 bouncy ball."),
+    BOUNCY_BALL_GIVE_AMOUNT("You have been given &ex<0> <1>&7 bouncy ball(s)."),
+    BOUNCY_BALL_SEND("You have given &a<0> &7a <1>&7 bouncy ball."),
+    BOUNCY_BALL_SEND_AMOUNT("You have given &a<0> &ex<1> <2>&7 bouncy ball(s)."),
     INVALID_NUMBER("You must provide a valid number"),
     PLAYER_NULL("That player does not seem to exist."),
     PLAYER_OFFLINE("You do not have permissions to run that command."),
     NO_PERMISSIONS("You do not have permissions to run that command."),
     NO_BOUNCY_BALLS("No bouncy balls have been created... type &b/bouncyballs create [name]"),
-    RELOAD("You have successfully reloaded the configuration and saved data.");
+    RELOAD("You have successfully reloaded the configuration and saved data."),
+    USAGE("&7Usage: &b/bouncyballs [create|give|reload]");
 
     private final String def;
     private final List<String> list;
diff --git a/src/main/java/com/huskydreaming/bouncyball/pareseables/Menu.java b/src/main/java/com/huskydreaming/bouncyball/enumerations/Menu.java
similarity index 55%
rename from src/main/java/com/huskydreaming/bouncyball/pareseables/Menu.java
rename to src/main/java/com/huskydreaming/bouncyball/enumerations/Menu.java
index a4b8989..11af501 100644
--- a/src/main/java/com/huskydreaming/bouncyball/pareseables/Menu.java
+++ b/src/main/java/com/huskydreaming/bouncyball/enumerations/Menu.java
@@ -1,54 +1,54 @@
-package com.huskydreaming.bouncyball.pareseables;
+package com.huskydreaming.bouncyball.enumerations;
 
 import com.google.common.base.Functions;
-import com.huskydreaming.huskycore.interfaces.Parseable;
+import com.huskydreaming.huskycore.utilities.general.Parseable;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public enum Menu implements Parseable {
 
     // Projectile Menu
-    PROJECTILE_TITLE("&f{0}"),
-    PROJECTILE_LORE(Collections.singletonList("&7Left-Click to retrieve bouncy ball.")),
+    PROJECTILE_TITLE("&f<0>"),
+    PROJECTILE_LORE(List.of("&7Left-Click to retrieve bouncy ball.")),
     PROJECTILE_EDIT("&7Right-Click to edit"),
 
     // Edit Menu
-
-    EDIT_AMOUNT_TITLE("&cAmount: &b{0}"),
+    EDIT_AMOUNT_TITLE("&cAmount: &b<0>"),
     EDIT_AMOUNT_LORE(List.of("", "&7Left-Click to increase", "&7Right-Click to decrease")),
-
-    EDIT_COLOR_TITLE("{0}{1}"),
-    EDIT_COLOR_LORE(Collections.singletonList("&7Click to select color")),
+    EDIT_BLOCK_TITLE("&eEdit Blocks"),
+    EDIT_BLOCK_LORE(List.of("&7Click to edit allowed blocks.")),
+    EDIT_COLOR_TITLE("<0><1>"),
+    EDIT_COLOR_LORE(List.of("&7Click to select color")),
     EDIT_DELETE_TITLE("&cDelete"),
-    EDIT_DELETE_LORE(Collections.singletonList("&7Click to delete bouncy ball")),
+    EDIT_DELETE_LORE(List.of("&7Click to delete bouncy ball")),
     EDIT_MATERIAL_TITLE("&eEdit Materials"),
-    EDIT_MATERIAL_LORE(Collections.singletonList("&7Click to edit material.")),
-
-    EDIT_PHYSICS_TITLE("&b{0}"),
+    EDIT_MATERIAL_LORE(List.of("&7Click to edit material.")),
+    EDIT_PHYSICS_TITLE("&b<0>"),
     EDIT_PHYSICS_LORE(List.of(
-            "&f{0}",
+            "&f<0>",
             "",
-            "&7Amount: &f{1}",
+            "&7Amount: &f<1>",
             "",
             "&7Left-Click to increment",
             "&7Right-Click to decrement")),
-
     EDIT_PARTICLE_TITLE("&eEdit Particles"),
-    EDIT_PARTICLE_LORE(Collections.singletonList("&7Click to edit particles.")),
-
-    EDIT_SET_MATERIAL_TITLE("&e{0}"),
-    EDIT_SET_PARTICLE_TITLE("&e{0}"),
-    EDIT_SET_MATERIAL_LORE(Collections.singletonList("&7Click to set material.")),
-    EDIT_SET_PARTICLE_LORE(Collections.singletonList("&7Click to set particle.")),
-    EDIT_CURRENT_MATERIAL_TITLE("&b{0}"),
-    EDIT_CURRENT_PARTICLE_TITLE("&b{0}"),
-    EDIT_CURRENT_MATERIAL_LORE(Collections.singletonList("&7This is the current material.")),
-    EDIT_CURRENT_PARTICLE_LORE(Collections.singletonList("&7This is the current particle."));
+    EDIT_PARTICLE_LORE(List.of("&7Click to edit particles.")),
+    EDIT_SET_BLOCK_TITLE("&e<0>"),
+    EDIT_SET_MATERIAL_TITLE("&e<0>"),
+    EDIT_SET_PARTICLE_TITLE("&e<0>"),
+    EDIT_SET_BLOCK_LORE(List.of("&7Click to set block as bounce-able.")),
+    EDIT_SET_MATERIAL_LORE(List.of("&7Click to set material.")),
+    EDIT_SET_PARTICLE_LORE(List.of("&7Click to set particle.")),
+    EDIT_CURRENT_BLOCK_TITLE("&b<0>"),
+    EDIT_CURRENT_MATERIAL_TITLE("&b<0>"),
+    EDIT_CURRENT_PARTICLE_TITLE("&b<0>"),
+    EDIT_CURRENT_BLOCK_LORE(List.of("&7You can bounce on this block.")),
+    EDIT_CURRENT_MATERIAL_LORE(List.of("&7This is the current material.")),
+    EDIT_CURRENT_PARTICLE_LORE(List.of("&7This is the current particle."));
 
     private final String def;
     private final List<String> list;
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/implementations/InventoryServiceImpl.java b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/InventoryHandlerImpl.java
similarity index 62%
rename from src/main/java/com/huskydreaming/bouncyball/services/implementations/InventoryServiceImpl.java
rename to src/main/java/com/huskydreaming/bouncyball/handlers/implementations/InventoryHandlerImpl.java
index cff4354..5bcd73c 100644
--- a/src/main/java/com/huskydreaming/bouncyball/services/implementations/InventoryServiceImpl.java
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/InventoryHandlerImpl.java
@@ -1,9 +1,10 @@
-package com.huskydreaming.bouncyball.services.implementations;
+package com.huskydreaming.bouncyball.handlers.implementations;
 
 import com.huskydreaming.bouncyball.data.particles.ParticleColor;
+import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
+import com.huskydreaming.bouncyball.handlers.interfaces.InventoryHandler;
 import com.huskydreaming.bouncyball.inventories.*;
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
 import com.huskydreaming.huskycore.utilities.Util;
 import fr.minuskube.inv.InventoryManager;
@@ -13,15 +14,25 @@
 import org.bukkit.World;
 
 import java.util.Arrays;
+import java.util.Map;
 
-public class InventoryServiceImpl implements InventoryService {
+public class InventoryHandlerImpl implements InventoryHandler {
 
     private InventoryManager inventoryManager;
+    private ProjectileRepository projectileRepository;
+
+    @Override
+    public void postInitialize(HuskyPlugin plugin) {
+        projectileRepository = plugin.provide(ProjectileRepository.class);
+
+        inventoryManager = new InventoryManager(plugin);
+        inventoryManager.init();
+    }
 
     @Override
     public SmartInventory getBouncyBallsInventory(HuskyPlugin plugin) {
-        ProjectileService projectileService = plugin.provide(ProjectileService.class);
-        String[] keys = projectileService.getProjectileDataMap().keySet().toArray(new String[0]);
+        Map<String, ProjectileData> projectileDataMap = projectileRepository.getProjectileDataMap();
+        String[] keys = projectileDataMap.keySet().toArray(new String[0]);
         int rows = (int) Math.ceil((double) keys.length / 9);
         MainInventory mainInventory = new MainInventory(plugin, rows, keys);
         return SmartInventory.builder()
@@ -36,11 +47,11 @@ public SmartInventory getBouncyBallsInventory(HuskyPlugin plugin) {
     @Override
     public SmartInventory getEditInventory(HuskyPlugin plugin, String key) {
         EditInventory mainInventory = new EditInventory(plugin, key);
-        String name =  Util.capitalize(key.replace("_", " "));
+        String name = Util.capitalize(key.replace("_", " "));
         return SmartInventory.builder()
                 .manager(inventoryManager)
                 .id("editInventory")
-                .size(4, 9)
+                .size(5, 9)
                 .provider(mainInventory)
                 .title("Editing: " + name)
                 .build();
@@ -56,24 +67,45 @@ public SmartInventory getMaterialInventory(World world, HuskyPlugin plugin, Stri
                 .toArray(new Material[0]);
 
         int rows = (int) Math.ceil((double) supportedMaterials.length / 9);
-        MaterialInventory mainInventory = new MaterialInventory(plugin, key, rows, supportedMaterials);
-        String name =  Util.capitalize(key.replace("_", " "));
+        MaterialInventory materialInventory = new MaterialInventory(plugin, key, rows, supportedMaterials, false);
+        String name = Util.capitalize(key.replace("_", " "));
         return SmartInventory.builder()
                 .manager(inventoryManager)
                 .id("materialInventory")
                 .size(Math.min(rows + 2, 5), 9)
-                .provider(mainInventory)
+                .provider(materialInventory)
                 .title("Materials: " + name)
                 .build();
     }
 
+    @Override
+    public SmartInventory getBlockInventory(World world, HuskyPlugin plugin, String key) {
+        Material[] materials = Material.values();
+        Material[] materialsWithoutAir = Arrays.copyOfRange(materials, 1, materials.length);
+        Material[] supportedMaterials = Arrays.stream(materialsWithoutAir)
+                .filter(material -> isEnabled(world, material) && material.isItem() && material.isBlock())
+                .toList()
+                .toArray(new Material[0]);
+
+        int rows = (int) Math.ceil((double) supportedMaterials.length / 9);
+        MaterialInventory materialInventory = new MaterialInventory(plugin, key, rows, supportedMaterials, true);
+        String name = Util.capitalize(key.replace("_", " "));
+        return SmartInventory.builder()
+                .manager(inventoryManager)
+                .id("blockInventory")
+                .size(Math.min(rows + 2, 5), 9)
+                .provider(materialInventory)
+                .title("Blocks: " + name)
+                .build();
+    }
+
     @Override
     public SmartInventory getParticleInventory(HuskyPlugin plugin, String key) {
         Particle[] particles = Particle.values();
         int rows = (int) Math.ceil((double) particles.length / 9);
 
         ParticleInventory particleInventory = new ParticleInventory(plugin, key, rows, particles);
-        String name =  Util.capitalize(key.replace("_", " "));
+        String name = Util.capitalize(key.replace("_", " "));
         return SmartInventory.builder()
                 .manager(inventoryManager)
                 .id("particleInventory")
@@ -98,14 +130,8 @@ public SmartInventory getColorInventory(HuskyPlugin plugin, String key) {
                 .build();
     }
 
-    @Override
-    public void deserialize(HuskyPlugin plugin) {
-        inventoryManager = new InventoryManager(plugin);
-        inventoryManager.init();
-    }
-
     private boolean isEnabled(World world, Material material) {
-        if(Util.getVersion().get(1) < 20) return true;
+        if (Util.getVersion().get(1) < 20) return true;
         return material.isEnabledByFeature(world);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/implementations/LocaleServiceImpl.java b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/LocalizationHandlerImpl.java
similarity index 74%
rename from src/main/java/com/huskydreaming/bouncyball/services/implementations/LocaleServiceImpl.java
rename to src/main/java/com/huskydreaming/bouncyball/handlers/implementations/LocalizationHandlerImpl.java
index 4afe6ed..960dba5 100644
--- a/src/main/java/com/huskydreaming/bouncyball/services/implementations/LocaleServiceImpl.java
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/LocalizationHandlerImpl.java
@@ -1,19 +1,18 @@
-package com.huskydreaming.bouncyball.services.implementations;
+package com.huskydreaming.bouncyball.handlers.implementations;
 
-import com.huskydreaming.bouncyball.services.interfaces.LocaleService;
-import com.huskydreaming.bouncyball.pareseables.Locale;
-import com.huskydreaming.bouncyball.pareseables.Menu;
+import com.huskydreaming.bouncyball.handlers.interfaces.LocalizationHandler;
+import com.huskydreaming.bouncyball.enumerations.Locale;
+import com.huskydreaming.bouncyball.enumerations.Menu;
 import com.huskydreaming.huskycore.HuskyPlugin;
 import com.huskydreaming.huskycore.storage.Yaml;
 
-public class LocaleServiceImpl implements LocaleService {
+public class LocalizationHandlerImpl implements LocalizationHandler {
 
     private Yaml locale;
     private Yaml menu;
 
     @Override
-    public void deserialize(HuskyPlugin plugin) {
-
+    public void initialize(HuskyPlugin plugin) {
         // Localization for general messages
         locale = new Yaml("localisation/locale");
         locale.load(plugin);
@@ -44,4 +43,4 @@ public Yaml getLocale() {
     public Yaml getMenu() {
         return menu;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/ParticleHandlerImpl.java b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/ParticleHandlerImpl.java
new file mode 100644
index 0000000..56240d5
--- /dev/null
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/ParticleHandlerImpl.java
@@ -0,0 +1,43 @@
+package com.huskydreaming.bouncyball.handlers.implementations;
+
+import com.huskydreaming.bouncyball.data.particles.ParticleData;
+import com.huskydreaming.bouncyball.handlers.interfaces.ParticleHandler;
+import com.huskydreaming.bouncyball.handlers.interfaces.ProjectileHandler;
+import com.huskydreaming.bouncyball.repositories.interfaces.ParticleRepository;
+import com.huskydreaming.huskycore.HuskyPlugin;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Particle;
+import org.bukkit.World;
+import org.bukkit.entity.Projectile;
+
+import java.util.Map;
+
+public class ParticleHandlerImpl implements ParticleHandler {
+
+    private ParticleRepository particleRepository;
+
+    @Override
+    public void postInitialize(HuskyPlugin plugin) {
+        particleRepository = plugin.provide(ParticleRepository.class);
+
+        ProjectileHandler projectileHandler = plugin.provide(ProjectileHandler.class);
+        Map<Projectile, String> projectileMap = projectileHandler.getProjectileMap();
+
+        Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> projectileMap.forEach((projectile, s) -> {
+            Location location = projectile.getLocation();
+            World world = location.getWorld();
+            if (world == null) return;
+
+            ParticleData particleData = particleRepository.getParticleData(s);
+            if (particleData == null) return;
+
+            if (particleData.getParticle() == Particle.REDSTONE) {
+                Particle.DustOptions dustOptions = new Particle.DustOptions(particleData.getColor(), 1);
+                world.spawnParticle(particleData.getParticle(), location, particleData.getCount(), dustOptions);
+            } else {
+                world.spawnParticle(particleData.getParticle(), location, particleData.getCount());
+            }
+        }), 0L, 1L);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/implementations/ProjectileServiceImpl.java b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/ProjectileHandlerImpl.java
similarity index 79%
rename from src/main/java/com/huskydreaming/bouncyball/services/implementations/ProjectileServiceImpl.java
rename to src/main/java/com/huskydreaming/bouncyball/handlers/implementations/ProjectileHandlerImpl.java
index a716b19..b71804b 100644
--- a/src/main/java/com/huskydreaming/bouncyball/services/implementations/ProjectileServiceImpl.java
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/implementations/ProjectileHandlerImpl.java
@@ -1,13 +1,11 @@
-package com.huskydreaming.bouncyball.services.implementations;
+package com.huskydreaming.bouncyball.handlers.implementations;
 
-import com.google.common.reflect.TypeToken;
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
-import com.huskydreaming.bouncyball.data.projectiles.ProjectileDefault;
 import com.huskydreaming.bouncyball.data.projectiles.ProjectilePhysics;
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileSetting;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
+import com.huskydreaming.bouncyball.handlers.interfaces.ProjectileHandler;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.storage.Json;
 import com.huskydreaming.huskycore.utilities.Util;
 import org.bukkit.*;
 import org.bukkit.block.Block;
@@ -21,45 +19,30 @@
 import org.bukkit.util.BlockIterator;
 import org.bukkit.util.Vector;
 
-import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class ProjectileServiceImpl implements ProjectileService {
+public class ProjectileHandlerImpl implements ProjectileHandler {
 
     private NamespacedKey projectileNameSpacedKey;
 
-    private Map<String, ProjectileData> projectileDataMap;
+    private ProjectileRepository projectileRepository;
     private final Map<Projectile, String> projectileMap = new ConcurrentHashMap<>();
 
     @Override
-    public void deserialize(HuskyPlugin plugin) {
-        Type type = new TypeToken<Map<String, ProjectileData>>() {
-        }.getType();
-        projectileDataMap = Json.read(plugin, "data/projectiles", type);
+    public void initialize(HuskyPlugin plugin) {
         projectileNameSpacedKey = new NamespacedKey(plugin, "BOUNCY_BALL");
-
-        if (projectileDataMap != null) return;
-        projectileDataMap = new ConcurrentHashMap<>();
-
-        for (ProjectileDefault projectileDefault : ProjectileDefault.values()) {
-            if (projectileDefault == ProjectileDefault.DEFAULT) continue;
-            String[] strings = projectileDefault.name().toLowerCase().split("_");
-            String string = Util.capitalize(String.join("_", strings));
-
-            projectileDataMap.put(string, projectileDefault.getProjectileData());
-        }
     }
 
     @Override
-    public void serialize(HuskyPlugin plugin) {
-        Json.write(plugin, "data/projectiles", projectileDataMap);
+    public void postInitialize(HuskyPlugin plugin) {
+        projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
     @Override
     public void launchProjectile(Plugin plugin, Player player, ItemStack itemStack, String key) {
-        ProjectileData projectileData = projectileDataMap.get(key);
+        ProjectileData projectileData = projectileRepository.getProjectileData(key);
 
         if (projectileData.getSettings().contains(ProjectileSetting.REMOVES)) {
             itemStack.setAmount(itemStack.getAmount() - 1);
@@ -96,8 +79,9 @@ public void dropProjectile(Projectile projectile) {
         item.setGlowing(projectileData.getSettings().contains(ProjectileSetting.GLOWS));
 
         if (projectileData.getSettings().contains(ProjectileSetting.ITEM_NAME)) {
+            String key = getKeyFromProjectile(projectile);
             item.setCustomNameVisible(true);
-            item.setCustomName(getKeyFromProjectile(projectile));
+            item.setCustomName(key);
         }
     }
 
@@ -106,6 +90,16 @@ public void onProjectileEnd(Projectile projectile) {
         // TODO: Projectile end effect
     }
 
+    @Override
+    public void removeProjectile(Projectile projectile) {
+        projectileMap.remove(projectile);
+    }
+
+    @Override
+    public Map<Projectile, String> getProjectileMap() {
+        return Collections.unmodifiableMap(projectileMap);
+    }
+
     @Override
     public Projectile updateProjectile(Plugin plugin, Projectile projectile) {
         ProjectileData projectileData = getDataFromProjectile(projectile);
@@ -139,9 +133,34 @@ public Projectile updateProjectile(Plugin plugin, Projectile projectile) {
         onProjectileEnd(projectile);
         dropProjectile(projectile);
         removeProjectile(projectile);
+
         return null;
     }
 
+    @Override
+    public void addProjectile(String key, Projectile projectile) {
+        projectileMap.put(projectile, key);
+    }
+
+    @Override
+    public boolean hasProjectileData(Entity entity) {
+        return entity.getPersistentDataContainer().has(projectileNameSpacedKey, PersistentDataType.STRING);
+    }
+
+    @Override
+    public String getKeyFromProjectile(Projectile projectile) {
+        PersistentDataContainer persistentDataContainer = projectile.getPersistentDataContainer();
+        return persistentDataContainer.get(projectileNameSpacedKey, PersistentDataType.STRING);
+    }
+
+    @Override
+    public ProjectileData getDataFromProjectile(Projectile projectile) {
+        String key = getKeyFromProjectile(projectile);
+        if (key == null) return null;
+
+        return projectileRepository.getProjectileData(key);
+    }
+
     @Override
     public String getKeyFromItemStack(ItemStack itemStack) {
         ItemMeta itemMeta = itemStack.getItemMeta();
@@ -153,7 +172,7 @@ public String getKeyFromItemStack(ItemStack itemStack) {
 
     @Override
     public ItemStack getItemStackFromKey(String key) {
-        ProjectileData projectileData = projectileDataMap.get(key);
+        ProjectileData projectileData = projectileRepository.getProjectileData(key);
         if (projectileData == null) return null;
 
         ItemStack itemStack = new ItemStack(projectileData.getMaterial());
@@ -187,20 +206,6 @@ public ItemStack getItemStackFromProjectile(Projectile projectile) {
         return itemStack;
     }
 
-    @Override
-    public String getKeyFromProjectile(Projectile projectile) {
-        PersistentDataContainer persistentDataContainer = projectile.getPersistentDataContainer();
-        return persistentDataContainer.get(projectileNameSpacedKey, PersistentDataType.STRING);
-    }
-
-    @Override
-    public ProjectileData getDataFromProjectile(Projectile projectile) {
-        String key = getKeyFromProjectile(projectile);
-        if (key == null) return null;
-
-        return projectileDataMap.get(key);
-    }
-
     @Override
     public BlockFace getInverseFace(Projectile projectile) {
         Location location = projectile.getLocation();
@@ -221,49 +226,4 @@ public BlockFace getInverseFace(Projectile projectile) {
         BlockFace blockFace = nextBlock.getFace(previousBlock);
         return blockFace == BlockFace.SELF ? BlockFace.UP : blockFace;
     }
-
-    @Override
-    public void removeProjectile(Projectile projectile) {
-        projectileMap.remove(projectile);
-    }
-
-    @Override
-    public void addProjectile(String key, Projectile projectile) {
-        projectileMap.put(projectile, key);
-    }
-
-    @Override
-    public void addProjectile(String key, ProjectileData projectileData) {
-        projectileDataMap.put(key, projectileData);
-    }
-
-    @Override
-    public void removeProjectile(String key) {
-        projectileDataMap.remove(key);
-    }
-
-    @Override
-    public boolean containKey(String key) {
-        return projectileDataMap.containsKey(key);
-    }
-
-    @Override
-    public boolean hasProjectileData(Entity entity) {
-        return entity.getPersistentDataContainer().has(projectileNameSpacedKey, PersistentDataType.STRING);
-    }
-
-    @Override
-    public ProjectileData getDataFromKey(String key) {
-        return projectileDataMap.get(key);
-    }
-
-    @Override
-    public Map<Projectile, String> getProjectileMap() {
-        return Collections.unmodifiableMap(projectileMap);
-    }
-
-    @Override
-    public Map<String, ProjectileData> getProjectileDataMap() {
-        return projectileDataMap;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/InventoryService.java b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/InventoryHandler.java
similarity index 65%
rename from src/main/java/com/huskydreaming/bouncyball/services/interfaces/InventoryService.java
rename to src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/InventoryHandler.java
index 1914908..7e81b93 100644
--- a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/InventoryService.java
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/InventoryHandler.java
@@ -1,18 +1,19 @@
-package com.huskydreaming.bouncyball.services.interfaces;
+package com.huskydreaming.bouncyball.handlers.interfaces;
 
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.interfaces.Service;
+import com.huskydreaming.huskycore.handlers.interfaces.Handler;
 import fr.minuskube.inv.SmartInventory;
 import org.bukkit.World;
 
-public interface InventoryService extends Service {
-
+public interface InventoryHandler extends Handler {
     SmartInventory getBouncyBallsInventory(HuskyPlugin plugin);
 
     SmartInventory getEditInventory(HuskyPlugin plugin, String key);
 
     SmartInventory getMaterialInventory(World world, HuskyPlugin plugin, String key);
 
+    SmartInventory getBlockInventory(World world, HuskyPlugin plugin, String key);
+
     SmartInventory getParticleInventory(HuskyPlugin plugin, String key);
 
     SmartInventory getColorInventory(HuskyPlugin plugin, String key);
diff --git a/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/LocalizationHandler.java b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/LocalizationHandler.java
new file mode 100644
index 0000000..729cf68
--- /dev/null
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/LocalizationHandler.java
@@ -0,0 +1,11 @@
+package com.huskydreaming.bouncyball.handlers.interfaces;
+
+import com.huskydreaming.huskycore.handlers.interfaces.Handler;
+import com.huskydreaming.huskycore.storage.Yaml;
+
+public interface LocalizationHandler extends Handler {
+
+    Yaml getLocale();
+
+    Yaml getMenu();
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/ParticleHandler.java b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/ParticleHandler.java
new file mode 100644
index 0000000..c8f334f
--- /dev/null
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/ParticleHandler.java
@@ -0,0 +1,7 @@
+package com.huskydreaming.bouncyball.handlers.interfaces;
+
+import com.huskydreaming.huskycore.handlers.interfaces.Handler;
+
+public interface ParticleHandler extends Handler {
+
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/ProjectileService.java b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/ProjectileHandler.java
similarity index 72%
rename from src/main/java/com/huskydreaming/bouncyball/services/interfaces/ProjectileService.java
rename to src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/ProjectileHandler.java
index 6d530f1..7a0d42d 100644
--- a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/ProjectileService.java
+++ b/src/main/java/com/huskydreaming/bouncyball/handlers/interfaces/ProjectileHandler.java
@@ -1,7 +1,7 @@
-package com.huskydreaming.bouncyball.services.interfaces;
+package com.huskydreaming.bouncyball.handlers.interfaces;
 
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
-import com.huskydreaming.huskycore.interfaces.Service;
+import com.huskydreaming.huskycore.handlers.interfaces.Handler;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -11,21 +11,21 @@
 
 import java.util.Map;
 
-public interface ProjectileService extends Service {
+public interface ProjectileHandler extends Handler {
 
-    BlockFace getInverseFace(Projectile projectile);
+    void launchProjectile(Plugin plugin, Player player, ItemStack itemStack, String key);
 
-    void removeProjectile(Projectile projectile);
+    void dropProjectile(Projectile projectile);
 
-    void addProjectile(String key, Projectile projectile);
+    void onProjectileEnd(Projectile projectile);
 
-    void addProjectile(String key, ProjectileData projectileData);
+    void removeProjectile(Projectile projectile);
 
-    void removeProjectile(String key);
+    Map<Projectile, String> getProjectileMap();
 
-    boolean containKey(String key);
+    Projectile updateProjectile(Plugin plugin, Projectile projectile);
 
-    void launchProjectile(Plugin plugin, Player player, ItemStack itemStack, String key);
+    void addProjectile(String key, Projectile projectile);
 
     boolean hasProjectileData(Entity entity);
 
@@ -33,21 +33,11 @@ public interface ProjectileService extends Service {
 
     ProjectileData getDataFromProjectile(Projectile projectile);
 
-    ProjectileData getDataFromKey(String key);
-
     String getKeyFromItemStack(ItemStack itemStack);
 
     ItemStack getItemStackFromKey(String key);
 
     ItemStack getItemStackFromProjectile(Projectile projectile);
 
-    void dropProjectile(Projectile projectile);
-
-    void onProjectileEnd(Projectile projectile);
-
-    Projectile updateProjectile(Plugin plugin, Projectile projectile);
-
-    Map<Projectile, String> getProjectileMap();
-
-    Map<String, ProjectileData> getProjectileDataMap();
-}
\ No newline at end of file
+    BlockFace getInverseFace(Projectile projectile);
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/inventories/ColorInventory.java b/src/main/java/com/huskydreaming/bouncyball/inventories/ColorInventory.java
index 446e895..6438f88 100644
--- a/src/main/java/com/huskydreaming/bouncyball/inventories/ColorInventory.java
+++ b/src/main/java/com/huskydreaming/bouncyball/inventories/ColorInventory.java
@@ -2,12 +2,11 @@
 
 import com.huskydreaming.bouncyball.data.particles.ParticleColor;
 import com.huskydreaming.bouncyball.data.particles.ParticleData;
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.ParticleService;
-import com.huskydreaming.bouncyball.pareseables.Menu;
+import com.huskydreaming.bouncyball.enumerations.Menu;
+import com.huskydreaming.bouncyball.repositories.interfaces.ParticleRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.inventories.InventoryPageProvider;
-import com.huskydreaming.huskycore.utilities.ItemBuilder;
+import com.huskydreaming.huskycore.inventories.providers.InventoryPageProvider;
+import com.huskydreaming.huskycore.utilities.builders.ItemBuilder;
 import fr.minuskube.inv.content.InventoryContents;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -16,20 +15,19 @@
 public class ColorInventory extends InventoryPageProvider<ParticleColor> {
 
     private final String key;
-    private final ParticleService particleService;
+    private final ParticleRepository particleRepository;
 
 
     public ColorInventory(HuskyPlugin plugin, String key, int rows, ParticleColor[] array) {
-        super(rows, array);
+        super("Colors", rows, array);
         this.key = key;
 
-        this.particleService = plugin.provide(ParticleService.class);
-        this.smartInventory = plugin.provide(InventoryService.class).getParticleInventory(plugin, key);
+        this.particleRepository = plugin.provide(ParticleRepository.class);
     }
 
     @Override
     public ItemStack construct(Player player, int index, ParticleColor particleColor) {
-        ParticleData particleData = particleService.getParticle(key);
+        ParticleData particleData = particleRepository.getParticleData(key);
         return ItemBuilder.create()
                 .setDisplayName(Menu.EDIT_COLOR_TITLE.parameterize(particleColor.getChatColor(), particleColor.getChatColor().getName()))
                 .setLore(Menu.EDIT_COLOR_LORE.parseList())
@@ -41,7 +39,8 @@ public ItemStack construct(Player player, int index, ParticleColor particleColor
     @Override
     public void run(InventoryClickEvent event, ParticleColor particleColor, InventoryContents contents) {
         if (event.getWhoClicked() instanceof Player player) {
-            particleService.getParticle(key).setColor(particleColor.getColor());
+            ParticleData particleData = particleRepository.getParticleData(key);
+            particleData.setColor(particleColor.getColor());
             contents.inventory().open(player);
         }
     }
diff --git a/src/main/java/com/huskydreaming/bouncyball/inventories/EditInventory.java b/src/main/java/com/huskydreaming/bouncyball/inventories/EditInventory.java
index d149d0b..5b8f581 100644
--- a/src/main/java/com/huskydreaming/bouncyball/inventories/EditInventory.java
+++ b/src/main/java/com/huskydreaming/bouncyball/inventories/EditInventory.java
@@ -3,13 +3,13 @@
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
 import com.huskydreaming.bouncyball.data.projectiles.ProjectilePhysics;
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileSetting;
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.pareseables.Menu;
+import com.huskydreaming.bouncyball.handlers.interfaces.InventoryHandler;
+import com.huskydreaming.bouncyball.enumerations.Menu;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
 import com.huskydreaming.huskycore.inventories.InventoryItem;
 import com.huskydreaming.huskycore.storage.parseables.DefaultMenu;
-import com.huskydreaming.huskycore.utilities.ItemBuilder;
+import com.huskydreaming.huskycore.utilities.builders.ItemBuilder;
 import fr.minuskube.inv.ClickableItem;
 import fr.minuskube.inv.content.InventoryContents;
 import fr.minuskube.inv.content.InventoryProvider;
@@ -26,35 +26,36 @@ public class EditInventory implements InventoryProvider {
 
     private final String key;
     private final HuskyPlugin plugin;
-    private final InventoryService inventoryService;
-    private final ProjectileService projectileService;
+    private final InventoryHandler inventoryHandler;
+    private final ProjectileRepository projectileRepository;
 
     public EditInventory(HuskyPlugin plugin, String key) {
         this.key = key;
         this.plugin = plugin;
 
-        this.inventoryService = plugin.provide(InventoryService.class);
-        this.projectileService = plugin.provide(ProjectileService.class);
+        this.inventoryHandler = plugin.provide(InventoryHandler.class);
+        this.projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
     @Override
     public void init(Player player, InventoryContents contents) {
         contents.fillBorders(InventoryItem.border());
 
-        contents.set(0, 0, InventoryItem.back(player, inventoryService.getBouncyBallsInventory(plugin)));
-        contents.set(0, 1, deleteItem());
+        contents.set(0, 0, InventoryItem.back(player, inventoryHandler.getBouncyBallsInventory(plugin)));
 
-        contents.set(1, 2, editMaterials());
-        contents.set(1, 3, editParticles());
+        contents.set(1, 2, editBlocks());
+        contents.set(1, 3, editMaterials());
+        contents.set(1, 4, editParticles());
+        contents.set(1, 5, deleteItem());
 
-        int physicsIndex = 4;
+        int index = 2;
         for (ProjectilePhysics projectilePhysics : ProjectilePhysics.values()) {
-            contents.set(1, physicsIndex++, physicsItem(projectilePhysics, contents));
+            contents.set(2, index++, physicsItem(projectilePhysics, contents));
         }
 
-        int settingsIndex = 2;
+        index = 2;
         for (ProjectileSetting projectileSetting : ProjectileSetting.values()) {
-            contents.set(2, settingsIndex++, activeItem(projectileSetting, contents));
+            contents.set(3, index++, activeItem(projectileSetting, contents));
         }
     }
 
@@ -63,6 +64,20 @@ public void update(Player player, InventoryContents contents) {
 
     }
 
+    private ClickableItem editBlocks() {
+        ItemStack itemStack = ItemBuilder.create()
+                .setDisplayName(Menu.EDIT_BLOCK_TITLE.parse())
+                .setLore(Menu.EDIT_BLOCK_LORE.parseList())
+                .setMaterial(Material.GRASS_BLOCK)
+                .build();
+
+        return ClickableItem.of(itemStack, e -> {
+            if (e.getWhoClicked() instanceof Player player) {
+                inventoryHandler.getBlockInventory(player.getWorld(), plugin, key).open(player);
+            }
+        });
+    }
+
     private ClickableItem editMaterials() {
         ItemStack itemStack = ItemBuilder.create()
                 .setDisplayName(Menu.EDIT_MATERIAL_TITLE.parse())
@@ -72,7 +87,7 @@ private ClickableItem editMaterials() {
 
         return ClickableItem.of(itemStack, e -> {
             if (e.getWhoClicked() instanceof Player player) {
-                inventoryService.getMaterialInventory(player.getWorld(), plugin, key).open(player);
+                inventoryHandler.getMaterialInventory(player.getWorld(), plugin, key).open(player);
             }
         });
     }
@@ -86,12 +101,12 @@ private ClickableItem deleteItem() {
 
         return ClickableItem.of(itemStack, e -> {
             if (e.getWhoClicked() instanceof Player player) {
-                projectileService.removeProjectile(key);
+                projectileRepository.removeProjectileData(key);
 
-                if (projectileService.getProjectileDataMap().isEmpty()) {
+                if (projectileRepository.getProjectileDataMap().isEmpty()) {
                     player.closeInventory();
                 } else {
-                    inventoryService.getBouncyBallsInventory(plugin).open(player);
+                    inventoryHandler.getBouncyBallsInventory(plugin).open(player);
                 }
 
             }
@@ -107,7 +122,7 @@ private ClickableItem editParticles() {
 
         return ClickableItem.of(itemStack, e -> {
             if (e.getWhoClicked() instanceof Player player) {
-                inventoryService.getParticleInventory(plugin, key).open(player);
+                inventoryHandler.getParticleInventory(plugin, key).open(player);
             }
         });
     }
@@ -119,17 +134,17 @@ private ClickableItem activeItem(ProjectileSetting projectileSetting, InventoryC
         String displayNameEnabled = DefaultMenu.ENABLE_TITLE.parameterize(projectileSetting.name());
         String displayNameDisabled = DefaultMenu.DISABLED_TITLE.parameterize(projectileSetting.name());
 
-        ProjectileData projectileData = projectileService.getDataFromKey(key);
+        ProjectileData projectileData = projectileRepository.getProjectileData(key);
         Set<ProjectileSetting> settings = projectileData.getSettings();
 
         boolean enabled = settings.contains(projectileSetting);
 
         String displayName = enabled ? displayNameEnabled : displayNameDisabled;
         Material material = Material.valueOf(enabled ? materialEnabled : materialDisabled);
-        String description = enabled ? DefaultMenu.ENABLED_DESCRIPTION.parse() : DefaultMenu.DISABLED_DESCRIPTION.parse();
+        String description = enabled ? DefaultMenu.DESCRIPTION_ENABLE.parse() : DefaultMenu.DESCRIPTION_DISABLE.parse();
 
         List<String> strings = new ArrayList<>();
-        strings.add(DefaultMenu.DESCRIPTION.parameterize(projectileSetting.getDescription()));
+        strings.add(DefaultMenu.DESCRIPTION_DEFAULT.parameterize(projectileSetting.getDescription()));
         strings.add("");
         strings.add(description);
 
@@ -152,7 +167,7 @@ private ClickableItem activeItem(ProjectileSetting projectileSetting, InventoryC
     }
 
     private ClickableItem physicsItem(ProjectilePhysics projectilePhysics, InventoryContents contents) {
-        ProjectileData projectileData = projectileService.getDataFromKey(key);
+        ProjectileData projectileData = projectileRepository.getProjectileData(key);
         double amount = projectileData.getPhysics(projectilePhysics);
 
         ItemStack itemStack = ItemBuilder.create()
diff --git a/src/main/java/com/huskydreaming/bouncyball/inventories/MainInventory.java b/src/main/java/com/huskydreaming/bouncyball/inventories/MainInventory.java
index 5ec103e..649d302 100644
--- a/src/main/java/com/huskydreaming/bouncyball/inventories/MainInventory.java
+++ b/src/main/java/com/huskydreaming/bouncyball/inventories/MainInventory.java
@@ -1,13 +1,14 @@
 package com.huskydreaming.bouncyball.inventories;
 
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.pareseables.Locale;
-import com.huskydreaming.bouncyball.pareseables.Menu;
+import com.huskydreaming.bouncyball.handlers.interfaces.InventoryHandler;
+import com.huskydreaming.bouncyball.handlers.interfaces.ProjectileHandler;
+import com.huskydreaming.bouncyball.enumerations.Locale;
+import com.huskydreaming.bouncyball.enumerations.Menu;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.inventories.InventoryPageProvider;
-import com.huskydreaming.huskycore.utilities.ItemBuilder;
+import com.huskydreaming.huskycore.inventories.providers.InventoryPageProvider;
+import com.huskydreaming.huskycore.utilities.builders.ItemBuilder;
 import fr.minuskube.inv.content.InventoryContents;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -16,21 +17,24 @@
 import java.util.List;
 
 public class MainInventory extends InventoryPageProvider<String> {
+
     private final HuskyPlugin plugin;
-    private final InventoryService inventoryService;
-    private final ProjectileService projectileService;
+    private final InventoryHandler inventoryHandler;
+    private final ProjectileHandler projectileHandler;
+    private final ProjectileRepository projectileRepository;
 
     public MainInventory(HuskyPlugin plugin, int rows, String[] keys) {
-        super(rows, keys);
+        super("Bouncy Balls", rows, keys);
         this.plugin = plugin;
 
-        this.projectileService = plugin.provide(ProjectileService.class);
-        this.inventoryService = plugin.provide(InventoryService.class);
+        this.inventoryHandler = plugin.provide(InventoryHandler.class);
+        this.projectileHandler = plugin.provide(ProjectileHandler.class);
+        this.projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
     @Override
     public ItemStack construct(Player player, int index, String key) {
-        ProjectileData projectileData = projectileService.getDataFromKey(key);
+        ProjectileData projectileData = projectileRepository.getProjectileData(key);
         List<String> lore = Menu.PROJECTILE_LORE.parseList();
         if (lore != null && (player.hasPermission("bouncyballs.edit") || player.isOp())) {
             lore.add(Menu.PROJECTILE_EDIT.parse());
@@ -45,14 +49,14 @@ public ItemStack construct(Player player, int index, String key) {
 
     @Override
     public void run(InventoryClickEvent event, String key, InventoryContents contents) {
-        ItemStack itemStack = projectileService.getItemStackFromKey(key);
+        ItemStack itemStack = projectileHandler.getItemStackFromKey(key);
         if (itemStack != null && event.getWhoClicked() instanceof Player player) {
             if (event.isLeftClick()) {
                 player.getInventory().addItem(itemStack);
                 player.sendMessage(Locale.BOUNCY_BALL_GIVE.prefix(key));
                 player.closeInventory();
             } else if (event.isRightClick() && (player.hasPermission("bouncyballs.edit") || player.isOp())) {
-                inventoryService.getEditInventory(plugin, key).open(player);
+                inventoryHandler.getEditInventory(plugin, key).open(player);
             }
         }
     }
diff --git a/src/main/java/com/huskydreaming/bouncyball/inventories/MaterialInventory.java b/src/main/java/com/huskydreaming/bouncyball/inventories/MaterialInventory.java
index 1636502..3daecf3 100644
--- a/src/main/java/com/huskydreaming/bouncyball/inventories/MaterialInventory.java
+++ b/src/main/java/com/huskydreaming/bouncyball/inventories/MaterialInventory.java
@@ -1,12 +1,12 @@
 package com.huskydreaming.bouncyball.inventories;
 
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.pareseables.Menu;
+import com.huskydreaming.bouncyball.handlers.interfaces.InventoryHandler;
+import com.huskydreaming.bouncyball.enumerations.Menu;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.inventories.InventoryPageProvider;
-import com.huskydreaming.huskycore.utilities.ItemBuilder;
+import com.huskydreaming.huskycore.inventories.providers.InventoryPageProvider;
+import com.huskydreaming.huskycore.utilities.builders.ItemBuilder;
 import fr.minuskube.inv.content.InventoryContents;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -16,28 +16,43 @@
 public class MaterialInventory extends InventoryPageProvider<Material> {
 
     private final String key;
+    private final boolean blocksOnly;
+
     private final HuskyPlugin plugin;
-    private final InventoryService inventoryService;
-    private final ProjectileService projectileService;
+    private final InventoryHandler inventoryHandler;
+    private final ProjectileRepository projectileRepository;
 
-    public MaterialInventory(HuskyPlugin plugin, String key, int rows, Material[] array) {
-        super(rows, array);
+    public MaterialInventory(HuskyPlugin plugin, String key, int rows, Material[] array, boolean blocksOnly) {
+        super(blocksOnly ? "Blocks" : "Materials", rows, array);
         this.key = key;
-        this.plugin = plugin;
+        this.blocksOnly = blocksOnly;
 
-        this.inventoryService = plugin.provide(InventoryService.class);
-        this.projectileService = plugin.provide(ProjectileService.class);
-        this.smartInventory = inventoryService.getEditInventory(plugin, key);
+        this.plugin = plugin;
+        this.inventoryHandler = plugin.provide(InventoryHandler.class);
+        this.projectileRepository = plugin.provide(ProjectileRepository.class);
     }
 
     @Override
     public ItemStack construct(Player player, int index, Material material) {
-        ProjectileData projectileData = projectileService.getDataFromKey(key);
+        ProjectileData projectileData = projectileRepository.getProjectileData(key);
 
-        boolean isMaterial = projectileData.getMaterial() == material;
+        boolean isMaterial;
+        if(blocksOnly) {
+            isMaterial = projectileData.getBlocks().contains(material);
+        } else {
+            isMaterial = projectileData.getMaterial() == material;
+        }
 
-        Menu title = isMaterial ? Menu.EDIT_CURRENT_MATERIAL_TITLE : Menu.EDIT_SET_MATERIAL_TITLE;
-        Menu lore = isMaterial ? Menu.EDIT_CURRENT_MATERIAL_LORE : Menu.EDIT_SET_MATERIAL_LORE;
+        Menu title;
+        Menu lore;
+
+        if(blocksOnly) {
+            title = isMaterial ? Menu.EDIT_CURRENT_BLOCK_TITLE : Menu.EDIT_SET_BLOCK_TITLE;
+            lore = isMaterial ? Menu.EDIT_CURRENT_BLOCK_LORE : Menu.EDIT_SET_BLOCK_LORE;
+        } else {
+            title = isMaterial ? Menu.EDIT_CURRENT_MATERIAL_TITLE : Menu.EDIT_SET_MATERIAL_TITLE;
+            lore = isMaterial ? Menu.EDIT_CURRENT_MATERIAL_LORE : Menu.EDIT_SET_MATERIAL_LORE;
+        }
 
         return ItemBuilder.create()
                 .setDisplayName(title.parameterize(material))
@@ -50,11 +65,21 @@ public ItemStack construct(Player player, int index, Material material) {
     @Override
     public void run(InventoryClickEvent event, Material material, InventoryContents contents) {
         if (event.getWhoClicked() instanceof Player player) {
-            ProjectileData projectileData = projectileService.getDataFromKey(key);
+            ProjectileData projectileData = projectileRepository.getProjectileData(key);
             if (projectileData.getMaterial() == material) return;
 
-            projectileData.setMaterial(material);
-            inventoryService.getEditInventory(plugin, key).open(player);
+            if(blocksOnly) {
+                if(projectileData.getBlocks().contains(material)) {
+                    projectileData.removeBlock(material);
+                } else {
+                    projectileData.addBlock(material);
+                }
+
+                inventoryHandler.getBlockInventory(player.getWorld(), plugin, key).open(player);
+            } else {
+                projectileData.setMaterial(material);
+                inventoryHandler.getMaterialInventory(player.getWorld(), plugin, key).open(player);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/inventories/ParticleInventory.java b/src/main/java/com/huskydreaming/bouncyball/inventories/ParticleInventory.java
index df34fc4..7fa9312 100644
--- a/src/main/java/com/huskydreaming/bouncyball/inventories/ParticleInventory.java
+++ b/src/main/java/com/huskydreaming/bouncyball/inventories/ParticleInventory.java
@@ -1,12 +1,12 @@
 package com.huskydreaming.bouncyball.inventories;
 
 import com.huskydreaming.bouncyball.data.particles.ParticleData;
-import com.huskydreaming.bouncyball.services.interfaces.InventoryService;
-import com.huskydreaming.bouncyball.services.interfaces.ParticleService;
-import com.huskydreaming.bouncyball.pareseables.Menu;
+import com.huskydreaming.bouncyball.handlers.interfaces.InventoryHandler;
+import com.huskydreaming.bouncyball.enumerations.Menu;
+import com.huskydreaming.bouncyball.repositories.interfaces.ParticleRepository;
 import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.inventories.InventoryPageProvider;
-import com.huskydreaming.huskycore.utilities.ItemBuilder;
+import com.huskydreaming.huskycore.inventories.providers.InventoryPageProvider;
+import com.huskydreaming.huskycore.utilities.builders.ItemBuilder;
 import fr.minuskube.inv.ClickableItem;
 import fr.minuskube.inv.content.InventoryContents;
 import org.bukkit.Material;
@@ -19,17 +19,16 @@ public class ParticleInventory extends InventoryPageProvider<Particle> {
 
     private final String key;
     private final HuskyPlugin plugin;
-    private final InventoryService inventoryService;
-    private final ParticleService particleService;
+    private final InventoryHandler inventoryHandler;
+    private final ParticleRepository particleRepository;
 
     public ParticleInventory(HuskyPlugin plugin, String key, int rows, Particle[] array) {
-        super(rows, array);
+        super("Particles", rows, array);
         this.key = key;
         this.plugin = plugin;
 
-        this.particleService = plugin.provide(ParticleService.class);
-        this.inventoryService = plugin.provide(InventoryService.class);
-        this.smartInventory = inventoryService.getEditInventory(plugin, key);
+        this.inventoryHandler = plugin.provide(InventoryHandler.class);
+        this.particleRepository = plugin.provide(ParticleRepository.class);
     }
 
     @Override
@@ -41,16 +40,17 @@ public void init(Player player, InventoryContents contents) {
 
     @Override
     public ItemStack construct(Player player, int index, Particle particle) {
-        ParticleData particleData = particleService.getParticle(key);
+        ParticleData particleData = particleRepository.getParticleData(key);
         boolean isParticle = particleData.getParticle().name().equals(particle.name());
 
         Menu title = isParticle ? Menu.EDIT_CURRENT_PARTICLE_TITLE : Menu.EDIT_SET_PARTICLE_TITLE;
         Menu lore = isParticle ? Menu.EDIT_CURRENT_PARTICLE_LORE : Menu.EDIT_SET_PARTICLE_LORE;
+        Material material = isParticle ? Material.ENDER_EYE : Material.ENDER_PEARL;
 
         return ItemBuilder.create()
                 .setDisplayName(title.parameterize(particle.name()))
                 .setLore(lore.parseList())
-                .setMaterial(Material.NETHER_STAR)
+                .setMaterial(material)
                 .setEnchanted(isParticle)
                 .build();
     }
@@ -58,17 +58,18 @@ public ItemStack construct(Player player, int index, Particle particle) {
     @Override
     public void run(InventoryClickEvent event, Particle particle, InventoryContents contents) {
         if (event.getWhoClicked() instanceof Player player) {
-            particleService.getParticle(key).setParticle(particle);
+            ParticleData particleData = particleRepository.getParticleData(key);
+            particleData.setParticle(particle);
             if (particle == Particle.REDSTONE) {
-                inventoryService.getColorInventory(plugin, key).open(player);
+                inventoryHandler.getColorInventory(plugin, key).open(player);
             } else {
-                smartInventory.open(player);
+                inventoryHandler.getParticleInventory(plugin, key).open(player);
             }
         }
     }
 
     private ClickableItem amountItem(InventoryContents contents) {
-        ParticleData particleData = particleService.getParticle(key);
+        ParticleData particleData = particleRepository.getParticleData(key);
         int count = particleData.getCount();
 
         ItemStack itemStack = ItemBuilder.create()
diff --git a/src/main/java/com/huskydreaming/bouncyball/listeners/ProjectileListener.java b/src/main/java/com/huskydreaming/bouncyball/listeners/ProjectileListener.java
index 25053cc..a60707c 100644
--- a/src/main/java/com/huskydreaming/bouncyball/listeners/ProjectileListener.java
+++ b/src/main/java/com/huskydreaming/bouncyball/listeners/ProjectileListener.java
@@ -3,7 +3,7 @@
 import com.huskydreaming.bouncyball.BouncyBallPlugin;
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
 import com.huskydreaming.bouncyball.data.projectiles.ProjectileSetting;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
+import com.huskydreaming.bouncyball.handlers.interfaces.ProjectileHandler;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -20,11 +20,11 @@
 public class ProjectileListener implements Listener {
 
     private final Plugin plugin;
-    private final ProjectileService projectileService;
+    private final ProjectileHandler projectileHandler;
 
     public ProjectileListener(BouncyBallPlugin plugin) {
         this.plugin = plugin;
-        this.projectileService = plugin.provide(ProjectileService.class);
+        this.projectileHandler = plugin.provide(ProjectileHandler.class);
     }
 
     @EventHandler
@@ -33,9 +33,9 @@ public void onInteract(PlayerInteractEvent event) {
             ItemStack itemStack = event.getItem();
             if (itemStack == null) return;
 
-            String key = projectileService.getKeyFromItemStack(itemStack);
+            String key = projectileHandler.getKeyFromItemStack(itemStack);
             if (key != null) {
-                projectileService.launchProjectile(plugin, event.getPlayer(), itemStack, key);
+                projectileHandler.launchProjectile(plugin, event.getPlayer(), itemStack, key);
                 event.setCancelled(true);
             } else {
                 event.setCancelled(false);
@@ -44,7 +44,7 @@ public void onInteract(PlayerInteractEvent event) {
             ItemStack itemStack = event.getItem();
             if (itemStack == null) return;
 
-            String key = projectileService.getKeyFromItemStack(itemStack);
+            String key = projectileHandler.getKeyFromItemStack(itemStack);
             if (key != null) {
                 event.setCancelled(true);
             }
@@ -56,7 +56,7 @@ public void onBlockEvent(BlockIgniteEvent event) {
         if (event.getCause() == BlockIgniteEvent.IgniteCause.FIREBALL) {
             Entity entity = event.getIgnitingEntity();
 
-            if (entity != null && projectileService.hasProjectileData(entity)) {
+            if (entity != null && projectileHandler.hasProjectileData(entity)) {
                 event.setCancelled(true);
             }
         }
@@ -67,35 +67,35 @@ public void onHit(ProjectileHitEvent event) {
 
         if (event.getEntity() instanceof Snowball snowball) {
 
-            ProjectileData projectileData = projectileService.getDataFromProjectile(snowball);
+            ProjectileData projectileData = projectileHandler.getDataFromProjectile(snowball);
             if (projectileData == null) return;
 
             if (event.getHitEntity() instanceof Player player) {
 
                 if (projectileData.getSettings().contains(ProjectileSetting.RETURNS)) {
 
-                    ItemStack itemStack = projectileService.getItemStackFromProjectile(snowball);
+                    ItemStack itemStack = projectileHandler.getItemStackFromProjectile(snowball);
                     if (itemStack == null) return;
 
                     player.getInventory().addItem(itemStack);
-                    projectileService.removeProjectile(snowball);
+                    projectileHandler.removeProjectile(snowball);
                     snowball.remove();
                     return;
                 }
             }
 
             if (projectileData.isBouncyBlock(event.getHitBlock())) {
-                String key = projectileService.getKeyFromProjectile(snowball);
-                Projectile projectile = projectileService.updateProjectile(plugin, snowball);
-                if (projectile != null) projectileService.addProjectile(key, projectile);
+                String key = projectileHandler.getKeyFromProjectile(snowball);
+                Projectile projectile = projectileHandler.updateProjectile(plugin, snowball);
+                if (projectile != null) projectileHandler.addProjectile(key, projectile);
 
-                projectileService.removeProjectile(snowball);
+                projectileHandler.removeProjectile(snowball);
                 snowball.remove();
                 return;
             }
 
-            projectileService.dropProjectile(snowball);
-            projectileService.removeProjectile(snowball);
+            projectileHandler.dropProjectile(snowball);
+            projectileHandler.removeProjectile(snowball);
             snowball.remove();
         }
     }
diff --git a/src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ParticleRepositoryImpl.java b/src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ParticleRepositoryImpl.java
new file mode 100644
index 0000000..ddf7593
--- /dev/null
+++ b/src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ParticleRepositoryImpl.java
@@ -0,0 +1,93 @@
+package com.huskydreaming.bouncyball.repositories.implementations;
+
+import com.huskydreaming.bouncyball.data.particles.ParticleData;
+import com.huskydreaming.bouncyball.data.projectiles.ProjectileDefault;
+import com.huskydreaming.bouncyball.repositories.interfaces.ParticleRepository;
+import com.huskydreaming.huskycore.HuskyPlugin;
+import com.huskydreaming.huskycore.storage.Yaml;
+import com.huskydreaming.huskycore.utilities.Util;
+import org.bukkit.Color;
+import org.bukkit.Particle;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class ParticleRepositoryImpl implements ParticleRepository {
+
+    private Map<String, ParticleData> particleDataMap;
+    private Yaml yaml;
+
+    @Override
+    public void deserialize(HuskyPlugin plugin) {
+        particleDataMap = new HashMap<>();
+        yaml = new Yaml("particles");
+        yaml.load(plugin);
+
+        FileConfiguration configuration = yaml.getConfiguration();
+        ConfigurationSection configurationSection = configuration.getConfigurationSection("");
+        if(configurationSection == null) return;
+
+        Set<String> keys = configurationSection.getKeys(false);
+        if (keys.isEmpty()) {
+            for (ProjectileDefault projectileDefault : ProjectileDefault.values()) {
+                if (projectileDefault == ProjectileDefault.DEFAULT) continue;
+                String[] strings = projectileDefault.name().toLowerCase().split("_");
+                String string = Util.capitalize(String.join("_", strings));
+
+                particleDataMap.put(string, projectileDefault.getParticleData());
+            }
+            yaml.save();
+            return;
+        }
+
+        for (String key : configurationSection.getKeys(false)) {
+            ParticleData particleData = new ParticleData();
+
+            int count = configuration.getInt(key + ".count");
+            particleData.setCount(count);
+
+            int r = configuration.getInt(key + ".color.r");
+            int g = configuration.getInt(key + ".color.g");
+            int b = configuration.getInt(key + ".color.b");
+
+            particleData.setColor(Color.fromRGB(r, g, b));
+
+            String particle = configuration.getString(key + ".type");
+            if (particle != null) particleData.setParticle(Particle.valueOf(particle));
+
+            particleDataMap.put(key, particleData);
+        }
+    }
+
+    @Override
+    public void serialize(HuskyPlugin plugin) {
+        FileConfiguration configuration = yaml.getConfiguration();
+
+        for(Map.Entry<String, ParticleData> particle : particleDataMap.entrySet()) {
+            ParticleData particleData = particle.getValue();
+            String key = particle.getKey();
+
+            configuration.set(key + ".count", particleData.getCount());
+            configuration.set(key + ".type", particleData.getParticle().name());
+            configuration.set(key + ".color.r", particleData.getColor().getRed());
+            configuration.set(key + ".color.g", particleData.getColor().getGreen());
+            configuration.set(key + ".color.b", particleData.getColor().getBlue());
+        }
+
+        yaml.save();
+        particleDataMap.clear();
+    }
+
+    @Override
+    public void addParticleData(String key, ParticleData particleData) {
+        particleDataMap.put(key, particleData);
+    }
+
+    @Override
+    public ParticleData getParticleData(String name) {
+        return particleDataMap.get(name);
+    }
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ProjectileRepositoryImpl.java b/src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ProjectileRepositoryImpl.java
new file mode 100644
index 0000000..d6ab0e1
--- /dev/null
+++ b/src/main/java/com/huskydreaming/bouncyball/repositories/implementations/ProjectileRepositoryImpl.java
@@ -0,0 +1,127 @@
+package com.huskydreaming.bouncyball.repositories.implementations;
+
+import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
+import com.huskydreaming.bouncyball.data.projectiles.ProjectileDefault;
+import com.huskydreaming.bouncyball.data.projectiles.ProjectilePhysics;
+import com.huskydreaming.bouncyball.data.projectiles.ProjectileSetting;
+import com.huskydreaming.bouncyball.repositories.interfaces.ProjectileRepository;
+import com.huskydreaming.huskycore.HuskyPlugin;
+import com.huskydreaming.huskycore.storage.Yaml;
+import com.huskydreaming.huskycore.utilities.Util;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class ProjectileRepositoryImpl implements ProjectileRepository {
+
+    private Map<String, ProjectileData> projectileDataMap;
+    private Yaml yaml;
+
+    @Override
+    public void deserialize(HuskyPlugin plugin) {
+        projectileDataMap = new ConcurrentHashMap<>();
+        yaml = new Yaml("projectiles");
+        yaml.load(plugin);
+
+        FileConfiguration configuration = yaml.getConfiguration();
+        ConfigurationSection configurationSection = configuration.getConfigurationSection("");
+        if(configurationSection == null) return;
+
+        Set<String> keys = configurationSection.getKeys(false);
+        if(keys.isEmpty()) {
+            for (ProjectileDefault projectileDefault : ProjectileDefault.values()) {
+                if (projectileDefault == ProjectileDefault.DEFAULT) continue;
+                String[] strings = projectileDefault.name().toLowerCase().split("_");
+                String string = Util.capitalize(String.join("_", strings));
+
+                projectileDataMap.put(string, projectileDefault.getProjectileData());
+            }
+            yaml.save();
+            return;
+        }
+
+        for(String key : keys) {
+            ProjectileData projectileData = new ProjectileData();
+
+            String materialName = configuration.getString(key + ".material");
+            if(materialName != null) projectileData.setMaterial(Material.valueOf(materialName));
+
+            int damping = configuration.getInt(key + ".physics.damping");
+            projectileData.setPhysics(ProjectilePhysics.DAMPING, damping);
+
+            int launchVelocity = configuration.getInt(key + ".physics.launch-velocity");
+            projectileData.setPhysics(ProjectilePhysics.LAUNCH_VELOCITY, launchVelocity);
+
+            int threshold = configuration.getInt(key + ".physics.threshold");
+            projectileData.setPhysics(ProjectilePhysics.THRESHOLD, threshold);
+
+            for(String setting : configuration.getStringList(key + ".settings")) {
+                projectileData.addSetting(ProjectileSetting.valueOf(setting));
+            }
+
+            for(String blockMaterial : configuration.getStringList(key + ".blocks")) {
+                projectileData.addBlock(Material.valueOf(blockMaterial));
+            }
+
+            projectileDataMap.put(key, projectileData);
+        }
+    }
+
+    @Override
+    public void serialize(HuskyPlugin plugin) {
+        FileConfiguration configuration = yaml.getConfiguration();
+
+        for(Map.Entry<String, ProjectileData> projectile : projectileDataMap.entrySet()) {
+            ProjectileData projectileData = projectile.getValue();
+            String key = projectile.getKey();
+
+            List<String> settings = new ArrayList<>();
+            for(ProjectileSetting setting : projectileData.getSettings()) {
+                settings.add(setting.name());
+            }
+
+            List<String> blockMaterials = new ArrayList<>();
+            for(Material blockMaterial : projectileData.getBlocks()) {
+                blockMaterials.add(blockMaterial.name());
+            }
+
+            configuration.set(key + ".settings", settings);
+            configuration.set(key + ".blocks", blockMaterials);
+            configuration.set(key + ".material", projectileData.getMaterial().name());
+            configuration.set(key + ".physics.damping", projectileData.getPhysics(ProjectilePhysics.DAMPING));
+            configuration.set(key + ".physics.launch-velocity", projectileData.getPhysics(ProjectilePhysics.LAUNCH_VELOCITY));
+            configuration.set(key + ".physics.threshold", projectileData.getPhysics(ProjectilePhysics.THRESHOLD));
+        }
+
+        yaml.save();
+        projectileDataMap.clear();
+    }
+
+    @Override
+    public void addProjectileData(String name, ProjectileData projectileData) {
+        projectileDataMap.put(name, projectileData);
+    }
+
+    @Override
+    public void removeProjectileData(String name) {
+        projectileDataMap.remove(name);
+    }
+
+    @Override
+    public boolean hasProjectileData(String name) {
+        return projectileDataMap.containsKey(name);
+    }
+
+    @Override
+    public ProjectileData getProjectileData(String name) {
+        return projectileDataMap.get(name);
+    }
+
+    @Override
+    public Map<String, ProjectileData> getProjectileDataMap() {
+        return Collections.unmodifiableMap(projectileDataMap);
+    }
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ParticleRepository.java b/src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ParticleRepository.java
new file mode 100644
index 0000000..fc51501
--- /dev/null
+++ b/src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ParticleRepository.java
@@ -0,0 +1,11 @@
+package com.huskydreaming.bouncyball.repositories.interfaces;
+
+import com.huskydreaming.bouncyball.data.particles.ParticleData;
+import com.huskydreaming.huskycore.repositories.Repository;
+
+public interface ParticleRepository extends Repository {
+
+    void addParticleData(String key, ParticleData particleData);
+
+    ParticleData getParticleData(String name);
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ProjectileRepository.java b/src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ProjectileRepository.java
new file mode 100644
index 0000000..702ed95
--- /dev/null
+++ b/src/main/java/com/huskydreaming/bouncyball/repositories/interfaces/ProjectileRepository.java
@@ -0,0 +1,19 @@
+package com.huskydreaming.bouncyball.repositories.interfaces;
+
+import com.huskydreaming.bouncyball.data.projectiles.ProjectileData;
+import com.huskydreaming.huskycore.repositories.Repository;
+
+import java.util.Map;
+
+public interface ProjectileRepository extends Repository {
+
+    ProjectileData getProjectileData(String name);
+
+    void addProjectileData(String name, ProjectileData projectileData);
+
+    void removeProjectileData(String name);
+
+    boolean hasProjectileData(String name);
+
+    Map<String, ProjectileData> getProjectileDataMap();
+}
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/implementations/ParticleServiceImpl.java b/src/main/java/com/huskydreaming/bouncyball/services/implementations/ParticleServiceImpl.java
deleted file mode 100644
index 712e4f9..0000000
--- a/src/main/java/com/huskydreaming/bouncyball/services/implementations/ParticleServiceImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.huskydreaming.bouncyball.services.implementations;
-
-import com.google.common.reflect.TypeToken;
-import com.huskydreaming.bouncyball.BouncyBallPlugin;
-import com.huskydreaming.bouncyball.data.particles.ParticleData;
-import com.huskydreaming.bouncyball.data.projectiles.ProjectileDefault;
-import com.huskydreaming.bouncyball.services.interfaces.ProjectileService;
-import com.huskydreaming.bouncyball.services.interfaces.ParticleService;
-import com.huskydreaming.huskycore.HuskyPlugin;
-import com.huskydreaming.huskycore.storage.Json;
-import com.huskydreaming.huskycore.utilities.Util;
-import org.bukkit.*;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ParticleServiceImpl implements ParticleService {
-
-    private Map<String, ParticleData> particleDataMap = new HashMap<>();
-    private final ProjectileService projectileService;
-
-    @Override
-    public void deserialize(HuskyPlugin plugin) {
-        Type type = new TypeToken<Map<String, ParticleData>>() {}.getType();
-        particleDataMap = Json.read(plugin, "data/particles", type);
-
-        if (particleDataMap != null) return;
-        particleDataMap = new ConcurrentHashMap<>();
-
-        for (ProjectileDefault projectileDefault : ProjectileDefault.values()) {
-            if (projectileDefault == ProjectileDefault.DEFAULT) continue;
-            String[] strings = projectileDefault.name().toLowerCase().split("_");
-            String string = Util.capitalize(String.join("_", strings));
-
-            particleDataMap.put(string, projectileDefault.getParticleData());
-        }
-
-    }
-
-    @Override
-    public void serialize(HuskyPlugin plugin) {
-        Json.write(plugin, "data/particles", particleDataMap);
-    }
-
-    public ParticleServiceImpl(BouncyBallPlugin plugin) {
-        this.projectileService = plugin.provide(ProjectileService.class);
-    }
-
-    @Override
-    public void addParticle(String key, ParticleData particleData) {
-        particleDataMap.put(key, particleData);
-    }
-
-    @Override
-    public ParticleData getParticle(String key) {
-        return particleDataMap.get(key);
-    }
-
-    @Override
-    public void run(BouncyBallPlugin plugin) {
-        Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> projectileService.getProjectileMap().forEach((projectile, s) -> {
-            Location location = projectile.getLocation();
-            World world = location.getWorld();
-            if (world == null) return;
-
-            ParticleData particleData = particleDataMap.get(s);
-            if (particleData == null) return;
-
-            if (particleData.getParticle() == Particle.REDSTONE) {
-                Particle.DustOptions dustOptions = new Particle.DustOptions(particleData.getColor(), 1);
-                world.spawnParticle(particleData.getParticle(), location, particleData.getCount(), dustOptions);
-            } else {
-                world.spawnParticle(particleData.getParticle(), location, particleData.getCount());
-            }
-        }), 0L, 1L);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/LocaleService.java b/src/main/java/com/huskydreaming/bouncyball/services/interfaces/LocaleService.java
deleted file mode 100644
index 3bb43bd..0000000
--- a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/LocaleService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.huskydreaming.bouncyball.services.interfaces;
-
-import com.huskydreaming.huskycore.interfaces.Service;
-import com.huskydreaming.huskycore.storage.Yaml;
-
-public interface LocaleService extends Service {
-
-    Yaml getLocale();
-
-    Yaml getMenu();
-}
diff --git a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/ParticleService.java b/src/main/java/com/huskydreaming/bouncyball/services/interfaces/ParticleService.java
deleted file mode 100644
index 6f08735..0000000
--- a/src/main/java/com/huskydreaming/bouncyball/services/interfaces/ParticleService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.huskydreaming.bouncyball.services.interfaces;
-
-import com.huskydreaming.bouncyball.BouncyBallPlugin;
-import com.huskydreaming.bouncyball.data.particles.ParticleData;
-import com.huskydreaming.huskycore.interfaces.Service;
-
-public interface ParticleService extends Service {
-
-    void addParticle(String key, ParticleData particleData);
-
-    ParticleData getParticle(String key);
-
-    void run(BouncyBallPlugin plugin);
-}
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index ecd0a4d..7a5d140 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: BouncyBalls
 main: com.huskydreaming.bouncyball.BouncyBallPlugin
 description: Balls with Juicy Physics and Customisation
 version: '${project.version}'
-api-version: 1.18
+api-version: 1.19
 author: HuskyDreaming
 website: https://www.spigotmc.org/members/huskydreaming.1413607/