[#376] Add support for 1.21 (#378)

* feat: add support for 1.21

* chore: update README

* fix: build pipeline running twice

* chore: add crafter to default config

* fix: invalid nms version on paper

* ci: remove unused buildtools versions

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   build:
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/buildtools.sh

@@ -24,14 +24,6 @@ checkVersion () {
   fi
 }
 
-checkVersion "1.9.4"  "8"
-checkVersion "1.10.2" "8"
-checkVersion "1.11.2" "8"
-checkVersion "1.12.2" "8"
-checkVersion "1.13"   "8"
-checkVersion "1.13.2" "8"
-checkVersion "1.14.4" "8"
-checkVersion "1.15.2" "8"
 checkVersion "1.16.1" "8"
 checkVersion "1.16.3" "8"
 checkVersion "1.16.5" "8"
@@ -45,3 +37,4 @@ checkVersion "1.20.1" "17"
 checkVersion "1.20.2" "17"
 checkVersion "1.20.4" "17"
 checkVersion "1.20.6" "21"
+checkVersion "1.21" "21"

README.md

@@ -1,7 +1,7 @@
-<img align="right" src="https://user-images.githubusercontent.com/8127996/90168671-bb49c780-dd9d-11ea-989d-479f8c1f3ea3.png" height="200" width="200">
 
 # Orebfuscator - Anti X-Ray
 [![Release Status](https://github.com/Imprex-Development/Orebfuscator/workflows/Releases/badge.svg)](https://github.com/Imprex-Development/Orebfuscator/releases/latest) [![Build Status](https://github.com/Imprex-Development/Orebfuscator/workflows/Build/badge.svg)](https://github.com/Imprex-Development/Orebfuscator/actions?query=workflow%3ABuild)
+<img align="right" src="https://user-images.githubusercontent.com/8127996/90168671-bb49c780-dd9d-11ea-989d-479f8c1f3ea3.png" height="200" width="200">
 
 Orebfuscator empowers server owners to protect their server from X-Ray Clients and Texture Packs, all while offering a high degree of configurability. This is achieved through modifying network packets without altering your game world, guaranteeing a secure and reliable experience for users. With Orebfuscator, you can tailor the settings to suit your server's needs, ensuring precise control over the visibility of specific blocks. This means that not only does Orebfuscator safeguard your world's integrity, but it also empowers you to fine-tune your Anti-X-Ray measures for the best gameplay experience.
 
@@ -14,9 +14,9 @@ Orebfuscator empowers server owners to protect their server from X-Ray Clients a
 * Dynamic Block Visibility: Adjust block visibility based on player proximity and distance.
 
 ### Requirements
-* Java 11 or higher
-* Spigot, Paper, Folia or compatible forks (1.9.4 or newer)
-* [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997) 5.0.0 or later
+* Java 17 or higher
+* Spigot, Paper, Folia or compatible forks (1.16 or newer)
+* [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997) 5.2.0 or later
 
 ### Installation
 1. Download [ProtocolLib](https://github.com/dmulloy2/ProtocolLib/releases)
@@ -26,6 +26,9 @@ Orebfuscator empowers server owners to protect their server from X-Ray Clients a
 
 Still having trouble getting Orebfuscator to run check out our [common issues](https://github.com/Imprex-Development/Orebfuscator/wiki/Common-Issues).
 
+### Legacy support
+For compatibility with Java 11 or Minecraft 1.9.4 and later, you can use any legacy release prior to version 5.5.0. Please note that these legacy releases will no longer receive regular support or updates. However, they may receive critical security and vulnerability patches if necessary.
+
 ### Maven
 
 To include the API in your Maven project, add the following configuration to your `pom.xml`:
@@ -52,7 +55,7 @@ To include the API in your Maven project, add the following configuration to you
 ## License:
 
 Completely rewritten by Imprex-Development to support v1.14 and higher Minecraft version's; these portions as permissible:
-Copyright (C) 2020-2023 by Imprex-Development. All rights reserved.
+Copyright (C) 2020-2024 by Imprex-Development. All rights reserved.
 
 Released under the same license as original.
 

orebfuscator-common/src/main/java/net/imprex/orebfuscator/config/AdvancedConfig.java

@@ -2,12 +2,8 @@
 
 public interface AdvancedConfig {
 
-	boolean useAsyncPacketListener();
-
 	int maxMillisecondsPerTick();
 
-	int protocolLibThreads();
-
 	int obfuscationWorkerThreads();
 
 	boolean hasObfuscationTimeout();

orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockProperties.java

@@ -69,13 +69,7 @@ private Builder(NamespacedKey key) {
 		}
 
 		public Builder withBlockState(BlockStateProperties blockState) {
-			return this.withBlockState(blockState, false);
-		}
-
-		/** dumb version for dumb id systems (pre 1.13.2) */
-		@Deprecated
-		public Builder withBlockState(BlockStateProperties blockState, boolean ignoreDuplicates) {
-			if (!blockStates.add(blockState) && !ignoreDuplicates) {
+			if (!blockStates.add(blockState)) {
 				throw new IllegalStateException(String.format("duplicate block state id (%s) for block: %s", blockState.getId(), key));
 			}
 

orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/MinecraftVersion.java

@@ -15,6 +15,7 @@ private static final class NmsMapping {
 		private static final List<NmsMapping> MAPPINGS = new ArrayList<>();
 
 		static {
+			MAPPINGS.add(new NmsMapping("1.21", "v1_21_R1"));
 			MAPPINGS.add(new NmsMapping("1.20.5", "v1_20_R4"));
 		}