From 831c1671537d003c9ea82230288d41691d8c05b1 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sun, 5 Jun 2022 22:22:54 -0500
Subject: [PATCH] Update for 1.2

---
 .idea/codeStyles/Plexus_Code_Style.xml | 49 ++++++++++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml   |  5 +++
 CONTRIBUTING.md                        |  2 +-
 build.gradle.kts                       |  6 ++--
 src/main/resources/module.yml          |  2 +-
 5 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 .idea/codeStyles/Plexus_Code_Style.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.idea/codeStyles/Plexus_Code_Style.xml b/.idea/codeStyles/Plexus_Code_Style.xml
new file mode 100644
index 0000000..a7db3e4
--- /dev/null
+++ b/.idea/codeStyles/Plexus_Code_Style.xml
@@ -0,0 +1,49 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Plexus Code Style" version="1">
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="BRACE_STYLE" value="2" />
+      <option name="CLASS_BRACE_STYLE" value="2" />
+      <option name="METHOD_BRACE_STYLE" value="2" />
+      <option name="LAMBDA_BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="0" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..df773a2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Plexus Code Style" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e9c962b..a6199f6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ For those who are wanting to contribute, we fully encourage doing so. There are
 3. Create a new branch that describes the new feature, enhancement, or bug fix. For example, this is good: `feature/add-xyz`. This is bad: `fix-this-lol`.
 4. Write the code that addresses your change.
 - Keep in mind that it **must** be formatted correctly. If you are using IntelliJ, there is a `codeStyle.xml` file that tells IntelliJ how to format your code. Check this link for information on how to use the file: https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes
-- If you are not using IntelliJ, that is fine. We use Allman style so please format your code accordingly.
+- If you are not using IntelliJ, that is fine. We use the Plexus Code Style (which is almost the same as Allman) so please format your code accordingly.
 6. Push your changes to your new branch and make a PR based off of that branch.
 
 ## Requirements for a PR
diff --git a/build.gradle.kts b/build.gradle.kts
index 0274663..a6d7ada 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,15 +19,15 @@ dependencies {
     compileOnly("org.projectlombok:lombok:1.18.24")
     annotationProcessor("org.projectlombok:lombok:1.18.24")
     compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT")
-    compileOnly("dev.plex:server:1.1")
-    compileOnly("dev.plex:api:1.1")
+    compileOnly("dev.plex:server:1.2-SNAPSHOT")
+    compileOnly("dev.plex:api:1.2-SNAPSHOT")
     compileOnly("dev.morphia.morphia:morphia-core:2.2.6")
     compileOnly("org.json:json:20220320")
     implementation("org.jetbrains:annotations:23.0.0")
 }
 
 group = "dev.plex"
-version = "1.1"
+version = "1.2-SNAPSHOT"
 description = "The Guilds module for Plex"
 
 java {
diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml
index 96facc9..fd5eda6 100644
--- a/src/main/resources/module.yml
+++ b/src/main/resources/module.yml
@@ -1,4 +1,4 @@
 name: Module-Guilds
 main: dev.plex.Guilds
 description: The guilds module for Plex
-version: 1.1
\ No newline at end of file
+version: 1.2-SNAPSHOT
\ No newline at end of file