From 7f9656d40a034ae71129d0121a01978dcffb15aa Mon Sep 17 00:00:00 2001
From: Natalie C <573729-vddcore@users.noreply.gitlab.com>
Date: Thu, 24 Nov 2022 13:50:47 +0000
Subject: [PATCH] Reverted last commit and fixed the root cause of package info
 issue

---
 Server/pom.xml                                | 122 ++++++++----------
 .../game/content/activity/package-info.java   |   6 -
 .../java/core/game/content/package-info.java  |   7 -
 .../decoration/costume/package-info.java      |   5 -
 .../skill/fletching/items/package-info.java   |   5 -
 .../game/node/entity/skill/package-info.java  |   7 -
 .../src/main/java/core/game/package-info.java |   7 -
 7 files changed, 57 insertions(+), 102 deletions(-)
 delete mode 100644 Server/src/main/java/core/game/content/activity/package-info.java
 delete mode 100644 Server/src/main/java/core/game/content/package-info.java
 delete mode 100644 Server/src/main/java/core/game/node/entity/skill/construction/decoration/costume/package-info.java
 delete mode 100644 Server/src/main/java/core/game/node/entity/skill/fletching/items/package-info.java
 delete mode 100644 Server/src/main/java/core/game/node/entity/skill/package-info.java
 delete mode 100644 Server/src/main/java/core/game/package-info.java

diff --git a/Server/pom.xml b/Server/pom.xml
index 42b7a13e8..188230d74 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -196,23 +196,22 @@
         <configuration>
           <maxmem>1024m</maxmem>
           <useIncrementalCompilation>false</useIncrementalCompilation>
-          <compilerArgs>
-            <arg>-XDcompilePolicy=simple</arg>
-            <arg>-Xpkginfo:always</arg>
-            <!-- <arg>-Xplugin:ErrorProne</arg> uncomment when fixing java static analysis errors !-->
-          </compilerArgs>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>com.google.errorprone</groupId>
-              <artifactId>error_prone_core</artifactId>
-              <version>2.9.0</version>
-            </path>
-            <!-- Other annotation processors go here.
+		  <compilerArgs>
+			<arg>-XDcompilePolicy=simple</arg>
+			<!-- <arg>-Xplugin:ErrorProne</arg> uncomment when fixing java static analysis errors !-->
+		  </compilerArgs>
+		  <annotationProcessorPaths>
+			<path>
+			  <groupId>com.google.errorprone</groupId>
+			  <artifactId>error_prone_core</artifactId>
+			  <version>2.9.0</version>
+			</path>
+			<!-- Other annotation processors go here.
 
-            If 'annotationProcessorPaths' is set, processors will no longer be
-            discovered on the regular -classpath; see also 'Using Error Prone
-            together with other annotation processors' below. -->
-          </annotationProcessorPaths>
+			If 'annotationProcessorPaths' is set, processors will no longer be
+			discovered on the regular -classpath; see also 'Using Error Prone
+			together with other annotation processors' below. -->
+		  </annotationProcessorPaths>
         </configuration>
         <executions>
           <!-- Replacing default-compile as it is treated specially by maven -->
@@ -258,59 +257,52 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.2.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <mainClass>rs09.Server</mainClass>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <!-- This can be run separately with mvn antrun:run@detekt -->
-            <id>detekt</id>
-            <phase>verify</phase>
-            <configuration>
-              <target name="detekt">
-                <java taskname="detekt" dir="${basedir}"
-                      fork="true"
-                      failonerror="true"
-                      classname="io.gitlab.arturbosch.detekt.cli.Main"
-                      classpathref="maven.plugin.classpath">
-                  <arg value="--input"/>
-                  <arg value="${basedir}/src/main/kotlin"/>
-                  <arg value="--excludes"/>
-                  <arg value="**/special/package/internal/**"/>
-                  <arg value="--report"/>
-                  <arg value="xml:${basedir}/reports/detekt.xml"/>
-                  <arg value="--config"/>
-                  <arg value="${basedir}/detekt.yml"/>
-                  <!--
-                  <arg value="-b" />
-                  <arg value="${basedir}/reports/baseline.xml"/>
-                  -->
-                </java>
-              </target>
-            </configuration>
-            <goals><goal>run</goal></goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>io.gitlab.arturbosch.detekt</groupId>
-            <artifactId>detekt-cli</artifactId>
-            <version>1.21.0</version>
-          </dependency>
-        </dependencies>
-      </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.8</version>
+            <executions>
+                <execution>
+                    <!-- This can be run separately with mvn antrun:run@detekt -->
+                    <id>detekt</id>
+                    <phase>verify</phase>
+                    <configuration>
+                        <target name="detekt">
+                            <java taskname="detekt" dir="${basedir}"
+                                  fork="true" 
+                                  failonerror="true"
+                                  classname="io.gitlab.arturbosch.detekt.cli.Main"
+                                  classpathref="maven.plugin.classpath">
+                                <arg value="--input"/>
+                                <arg value="${basedir}/src/main/kotlin"/>
+                                <arg value="--excludes"/>
+                                <arg value="**/special/package/internal/**"/>
+                                <arg value="--report"/>
+                                <arg value="xml:${basedir}/reports/detekt.xml"/>
+								<arg value="--config"/>
+								<arg value="${basedir}/detekt.yml"/>
+                                <!--
+								<arg value="-b" />
+                                <arg value="${basedir}/reports/baseline.xml"/>
+								-->
+                            </java>
+                        </target>
+                    </configuration>
+                    <goals><goal>run</goal></goals>
+                </execution>
+            </executions>
+            <dependencies>
+                <dependency>
+                    <groupId>io.gitlab.arturbosch.detekt</groupId>
+                    <artifactId>detekt-cli</artifactId>
+                    <version>1.21.0</version>
+                </dependency>
+            </dependencies>
+        </plugin>
     </plugins>
   </build>
   <repositories>
diff --git a/Server/src/main/java/core/game/content/activity/package-info.java b/Server/src/main/java/core/game/content/activity/package-info.java
deleted file mode 100644
index 095ee709c..000000000
--- a/Server/src/main/java/core/game/content/activity/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Holds all the plugin classes.
- * 
- * @author Emperor
- */
-package core.game.content.activity;
\ No newline at end of file
diff --git a/Server/src/main/java/core/game/content/package-info.java b/Server/src/main/java/core/game/content/package-info.java
deleted file mode 100644
index f9a620503..000000000
--- a/Server/src/main/java/core/game/content/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Holds more important content classes.
- * 
- * @author Emperor
- *
- */
-package core.game.content;
\ No newline at end of file
diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/costume/package-info.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/costume/package-info.java
deleted file mode 100644
index 7236c5772..000000000
--- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/costume/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @author Leewo
- *
- */
-package core.game.node.entity.skill.construction.decoration.costume;
\ No newline at end of file
diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/items/package-info.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/package-info.java
deleted file mode 100644
index 17b72ab37..000000000
--- a/Server/src/main/java/core/game/node/entity/skill/fletching/items/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @author Adam
- * 
- */
-package core.game.node.entity.skill.fletching.items;
\ No newline at end of file
diff --git a/Server/src/main/java/core/game/node/entity/skill/package-info.java b/Server/src/main/java/core/game/node/entity/skill/package-info.java
deleted file mode 100644
index b39254204..000000000
--- a/Server/src/main/java/core/game/node/entity/skill/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Holds skill-related plugins.
- * 
- * @author Emperor
- * 
- */
-package core.game.node.entity.skill;
\ No newline at end of file
diff --git a/Server/src/main/java/core/game/package-info.java b/Server/src/main/java/core/game/package-info.java
deleted file mode 100644
index bd16114fa..000000000
--- a/Server/src/main/java/core/game/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Used for handling important aspects of the game.
- * 
- * @author Emperor
- *
- */
-package core.game;
\ No newline at end of file