diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b7ee9bb..541c92cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,9 +12,8 @@ jobs: - name: Setup java uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: '16' - check-latest: true - name: Run maven build lifecycle run: mvn --batch-mode clean test package diff --git a/.gitignore b/.gitignore index d4414a71..dcc8dae7 100644 --- a/.gitignore +++ b/.gitignore @@ -179,4 +179,5 @@ logs/ .gradle/ build/ -logs/ \ No newline at end of file +logs/ +.java-version diff --git a/src/test/java/com/comphenix/protocol/BukkitInitialization.java b/src/test/java/com/comphenix/protocol/BukkitInitialization.java index a1afd3d0..0fa575a8 100644 --- a/src/test/java/com/comphenix/protocol/BukkitInitialization.java +++ b/src/test/java/com/comphenix/protocol/BukkitInitialization.java @@ -40,12 +40,27 @@ public class BukkitInitialization { private boolean initialized; private boolean packaged; - public static synchronized void initializePackage() { - instance.setPackage(); + /** + * Statically initializes the mock server for unit testing + */ + public static synchronized void initializeAll() { + instance.initialize(); } + /** + * @deprecated - Replaced with initializeAll() + */ + @Deprecated + public static synchronized void initializePackage() { + initializeAll(); + } + + /** + * @deprecated - Replaced with initializeAll() + */ + @Deprecated public static synchronized void initializeItemMeta() { - instance.initialize(); + initializeAll(); } /** @@ -63,7 +78,7 @@ public class BukkitInitialization { ex.printStackTrace(); } - initializePackage(); + instance.setPackage(); SharedConstants.a(); DispenserRegistry.init();