From 82ec8845d698ef0b24ed70e7942b9cbf2d061084 Mon Sep 17 00:00:00 2001
From: Snabeldier <79211348+Snabeldier@users.noreply.github.com>
Date: Mon, 1 Jul 2024 23:39:15 +0200
Subject: [PATCH] add new service events and restructure files

---
 .../events/UserEnterFractionServiceEvent.java   | 16 ----------------
 .../events/UserLeaveFractionServiceEvent.java   | 16 ----------------
 .../{ => prison}/UserImprisonmentEvent.java     |  3 ++-
 .../{ => prison}/UserPrisonReleaseEvent.java    |  3 ++-
 .../{ => punishment}/UserFreezeEvent.java       |  3 ++-
 .../{ => punishment}/UserUnfreezeEvent.java     |  3 ++-
 .../UserEnterFractionServiceEvent.java          | 13 +++++++++++++
 .../UserLeaveFractionServiceEvent.java          | 13 +++++++++++++
 .../UserUpdateFractionServiceEvent.java         | 17 +++++++++++++++++
 .../support/UserEnterSupportServiceEvent.java   | 11 +++++++++++
 .../support/UserLeaveSupportServiceEvent.java   | 11 +++++++++++
 .../support/UserUpdateSupportServiceEvent.java  | 11 +++++++++++
 .../team/UserEnterTeamServiceEvent.java         | 10 ++++++++++
 .../team/UserLeaveTeamServiceEvent.java         | 10 ++++++++++
 .../team/UserUpdateTeamServiceEvent.java        | 11 +++++++++++
 15 files changed, 115 insertions(+), 36 deletions(-)
 delete mode 100644 src/main/java/minevalley/core/api/users/events/UserEnterFractionServiceEvent.java
 delete mode 100644 src/main/java/minevalley/core/api/users/events/UserLeaveFractionServiceEvent.java
 rename src/main/java/minevalley/core/api/users/events/{ => prison}/UserImprisonmentEvent.java (72%)
 rename src/main/java/minevalley/core/api/users/events/{ => prison}/UserPrisonReleaseEvent.java (73%)
 rename src/main/java/minevalley/core/api/users/events/{ => punishment}/UserFreezeEvent.java (60%)
 rename src/main/java/minevalley/core/api/users/events/{ => punishment}/UserUnfreezeEvent.java (68%)
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/fractions/UserEnterFractionServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/fractions/UserLeaveFractionServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/fractions/UserUpdateFractionServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/support/UserEnterSupportServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/support/UserLeaveSupportServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/support/UserUpdateSupportServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/team/UserEnterTeamServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/team/UserLeaveTeamServiceEvent.java
 create mode 100644 src/main/java/minevalley/core/api/users/events/services/team/UserUpdateTeamServiceEvent.java

diff --git a/src/main/java/minevalley/core/api/users/events/UserEnterFractionServiceEvent.java b/src/main/java/minevalley/core/api/users/events/UserEnterFractionServiceEvent.java
deleted file mode 100644
index 63b9642f..00000000
--- a/src/main/java/minevalley/core/api/users/events/UserEnterFractionServiceEvent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package minevalley.core.api.users.events;
-
-import lombok.Getter;
-import minevalley.core.api.users.User;
-import minevalley.core.api.users.enums.FractionService;
-
-@Getter
-public class UserEnterFractionServiceEvent extends UserEvent {
-
-    private final FractionService fractionService;
-
-    public UserEnterFractionServiceEvent(User user, FractionService fractionService) {
-        super(user);
-        this.fractionService = fractionService;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/UserLeaveFractionServiceEvent.java b/src/main/java/minevalley/core/api/users/events/UserLeaveFractionServiceEvent.java
deleted file mode 100644
index 6752f094..00000000
--- a/src/main/java/minevalley/core/api/users/events/UserLeaveFractionServiceEvent.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package minevalley.core.api.users.events;
-
-import lombok.Getter;
-import minevalley.core.api.users.User;
-import minevalley.core.api.users.enums.FractionService;
-
-@Getter
-public class UserLeaveFractionServiceEvent extends UserEvent {
-
-    private final FractionService fractionService;
-
-    public UserLeaveFractionServiceEvent(User user, FractionService fractionService) {
-        super(user);
-        this.fractionService = fractionService;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/UserImprisonmentEvent.java b/src/main/java/minevalley/core/api/users/events/prison/UserImprisonmentEvent.java
similarity index 72%
rename from src/main/java/minevalley/core/api/users/events/UserImprisonmentEvent.java
rename to src/main/java/minevalley/core/api/users/events/prison/UserImprisonmentEvent.java
index 6bc4bdfd..ddd494ff 100644
--- a/src/main/java/minevalley/core/api/users/events/UserImprisonmentEvent.java
+++ b/src/main/java/minevalley/core/api/users/events/prison/UserImprisonmentEvent.java
@@ -1,7 +1,8 @@
-package minevalley.core.api.users.events;
+package minevalley.core.api.users.events.prison;
 
 import lombok.Getter;
 import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.UserEvent;
 
 /**
  * This event gets called when a user is getting imprisoned.
diff --git a/src/main/java/minevalley/core/api/users/events/UserPrisonReleaseEvent.java b/src/main/java/minevalley/core/api/users/events/prison/UserPrisonReleaseEvent.java
similarity index 73%
rename from src/main/java/minevalley/core/api/users/events/UserPrisonReleaseEvent.java
rename to src/main/java/minevalley/core/api/users/events/prison/UserPrisonReleaseEvent.java
index 613f8b3a..af928b32 100644
--- a/src/main/java/minevalley/core/api/users/events/UserPrisonReleaseEvent.java
+++ b/src/main/java/minevalley/core/api/users/events/prison/UserPrisonReleaseEvent.java
@@ -1,7 +1,8 @@
-package minevalley.core.api.users.events;
+package minevalley.core.api.users.events.prison;
 
 import lombok.Getter;
 import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.UserEvent;
 
 /**
  * This event gets called when a user is released from prison.
diff --git a/src/main/java/minevalley/core/api/users/events/UserFreezeEvent.java b/src/main/java/minevalley/core/api/users/events/punishment/UserFreezeEvent.java
similarity index 60%
rename from src/main/java/minevalley/core/api/users/events/UserFreezeEvent.java
rename to src/main/java/minevalley/core/api/users/events/punishment/UserFreezeEvent.java
index 98bed53c..d8d9f804 100644
--- a/src/main/java/minevalley/core/api/users/events/UserFreezeEvent.java
+++ b/src/main/java/minevalley/core/api/users/events/punishment/UserFreezeEvent.java
@@ -1,6 +1,7 @@
-package minevalley.core.api.users.events;
+package minevalley.core.api.users.events.punishment;
 
 import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.UserEvent;
 
 
 public class UserFreezeEvent extends UserEvent {
diff --git a/src/main/java/minevalley/core/api/users/events/UserUnfreezeEvent.java b/src/main/java/minevalley/core/api/users/events/punishment/UserUnfreezeEvent.java
similarity index 68%
rename from src/main/java/minevalley/core/api/users/events/UserUnfreezeEvent.java
rename to src/main/java/minevalley/core/api/users/events/punishment/UserUnfreezeEvent.java
index eeef51a4..be525401 100644
--- a/src/main/java/minevalley/core/api/users/events/UserUnfreezeEvent.java
+++ b/src/main/java/minevalley/core/api/users/events/punishment/UserUnfreezeEvent.java
@@ -1,6 +1,7 @@
-package minevalley.core.api.users.events;
+package minevalley.core.api.users.events.punishment;
 
 import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.UserEvent;
 
 /**
  * This event gets called when a user is unfreezed.
diff --git a/src/main/java/minevalley/core/api/users/events/services/fractions/UserEnterFractionServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/fractions/UserEnterFractionServiceEvent.java
new file mode 100644
index 00000000..e0cf27c9
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/fractions/UserEnterFractionServiceEvent.java
@@ -0,0 +1,13 @@
+package minevalley.core.api.users.events.services.fractions;
+
+import lombok.Getter;
+import minevalley.core.api.users.User;
+import minevalley.core.api.users.enums.FractionService;
+
+@Getter
+public class UserEnterFractionServiceEvent extends UserUpdateFractionServiceEvent {
+
+    public UserEnterFractionServiceEvent(User user, FractionService fractionService) {
+        super(user, fractionService);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/fractions/UserLeaveFractionServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/fractions/UserLeaveFractionServiceEvent.java
new file mode 100644
index 00000000..02560e6a
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/fractions/UserLeaveFractionServiceEvent.java
@@ -0,0 +1,13 @@
+package minevalley.core.api.users.events.services.fractions;
+
+import lombok.Getter;
+import minevalley.core.api.users.User;
+import minevalley.core.api.users.enums.FractionService;
+
+@Getter
+public class UserLeaveFractionServiceEvent extends UserUpdateFractionServiceEvent {
+
+    public UserLeaveFractionServiceEvent(User user, FractionService fractionService) {
+        super(user, fractionService);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/fractions/UserUpdateFractionServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/fractions/UserUpdateFractionServiceEvent.java
new file mode 100644
index 00000000..c072723a
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/fractions/UserUpdateFractionServiceEvent.java
@@ -0,0 +1,17 @@
+package minevalley.core.api.users.events.services.fractions;
+
+import lombok.Getter;
+import minevalley.core.api.users.User;
+import minevalley.core.api.users.enums.FractionService;
+import minevalley.core.api.users.events.UserEvent;
+
+@Getter
+public abstract class UserUpdateFractionServiceEvent extends UserEvent {
+
+    private final FractionService fractionService;
+
+    public UserUpdateFractionServiceEvent(User user, FractionService fractionService) {
+        super(user);
+        this.fractionService = fractionService;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/support/UserEnterSupportServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/support/UserEnterSupportServiceEvent.java
new file mode 100644
index 00000000..3435a90a
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/support/UserEnterSupportServiceEvent.java
@@ -0,0 +1,11 @@
+package minevalley.core.api.users.events.services.support;
+
+import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.services.team.UserUpdateTeamServiceEvent;
+
+public class UserEnterSupportServiceEvent extends UserUpdateTeamServiceEvent {
+
+    public UserEnterSupportServiceEvent(User user) {
+        super(user);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/support/UserLeaveSupportServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/support/UserLeaveSupportServiceEvent.java
new file mode 100644
index 00000000..6149fa2b
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/support/UserLeaveSupportServiceEvent.java
@@ -0,0 +1,11 @@
+package minevalley.core.api.users.events.services.support;
+
+import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.services.team.UserUpdateTeamServiceEvent;
+
+public class UserLeaveSupportServiceEvent extends UserUpdateTeamServiceEvent {
+
+    public UserLeaveSupportServiceEvent(User user) {
+        super(user);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/support/UserUpdateSupportServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/support/UserUpdateSupportServiceEvent.java
new file mode 100644
index 00000000..785c6e71
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/support/UserUpdateSupportServiceEvent.java
@@ -0,0 +1,11 @@
+package minevalley.core.api.users.events.services.support;
+
+import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.UserEvent;
+
+public abstract class UserUpdateSupportServiceEvent extends UserEvent {
+
+    public UserUpdateSupportServiceEvent(User user) {
+        super(user);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/team/UserEnterTeamServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/team/UserEnterTeamServiceEvent.java
new file mode 100644
index 00000000..4ac29b89
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/team/UserEnterTeamServiceEvent.java
@@ -0,0 +1,10 @@
+package minevalley.core.api.users.events.services.team;
+
+import minevalley.core.api.users.User;
+
+public class UserEnterTeamServiceEvent extends UserUpdateTeamServiceEvent {
+
+    public UserEnterTeamServiceEvent(User user) {
+        super(user);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/team/UserLeaveTeamServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/team/UserLeaveTeamServiceEvent.java
new file mode 100644
index 00000000..7e18ed04
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/team/UserLeaveTeamServiceEvent.java
@@ -0,0 +1,10 @@
+package minevalley.core.api.users.events.services.team;
+
+import minevalley.core.api.users.User;
+
+public class UserLeaveTeamServiceEvent extends UserUpdateTeamServiceEvent {
+
+    public UserLeaveTeamServiceEvent(User user) {
+        super(user);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/minevalley/core/api/users/events/services/team/UserUpdateTeamServiceEvent.java b/src/main/java/minevalley/core/api/users/events/services/team/UserUpdateTeamServiceEvent.java
new file mode 100644
index 00000000..cf071173
--- /dev/null
+++ b/src/main/java/minevalley/core/api/users/events/services/team/UserUpdateTeamServiceEvent.java
@@ -0,0 +1,11 @@
+package minevalley.core.api.users.events.services.team;
+
+import minevalley.core.api.users.User;
+import minevalley.core.api.users.events.UserEvent;
+
+public abstract class UserUpdateTeamServiceEvent extends UserEvent {
+
+    public UserUpdateTeamServiceEvent(User user) {
+        super(user);
+    }
+}
\ No newline at end of file