fix: duplicate id error on server versions pre 1.13.2 (#364)

Imprex-Development · Mar 30, 2024 · 709e987 · 709e987
1 parent 43b6807
commit 709e987
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockProperties.java b/orebfuscator-common/src/main/java/net/imprex/orebfuscator/util/BlockProperties.java
@@ -69,7 +69,13 @@ private Builder(NamespacedKey key) {
 		}
 
 		public Builder withBlockState(BlockStateProperties blockState) {
-			if (!blockStates.add(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) {
 				throw new IllegalStateException(String.format("duplicate block state id (%s) for block: %s", blockState.getId(), key));
 			}
 

diff --git a/...bfuscator-nms-v1_10_R1/src/main/java/net/imprex/orebfuscator/nms/v1_10_R1/NmsManager.java b/...bfuscator-nms-v1_10_R1/src/main/java/net/imprex/orebfuscator/nms/v1_10_R1/NmsManager.java
@@ -98,7 +98,7 @@ public NmsManager(Config config) {
 						.withIsDefaultState(Objects.equals(block.getBlockData(), blockState))
 						.build();
 
-				builder.withBlockState(properties);
+				builder.withBlockState(properties, true);
 			}
 
 			this.registerBlockProperties(builder.build());

diff --git a/...bfuscator-nms-v1_11_R1/src/main/java/net/imprex/orebfuscator/nms/v1_11_R1/NmsManager.java b/...bfuscator-nms-v1_11_R1/src/main/java/net/imprex/orebfuscator/nms/v1_11_R1/NmsManager.java
@@ -98,7 +98,7 @@ public NmsManager(Config config) {
 						.withIsDefaultState(Objects.equals(block.getBlockData(), blockState))
 						.build();
 
-				builder.withBlockState(properties);
+				builder.withBlockState(properties, true);
 			}
 
 			this.registerBlockProperties(builder.build());

diff --git a/...bfuscator-nms-v1_12_R1/src/main/java/net/imprex/orebfuscator/nms/v1_12_R1/NmsManager.java b/...bfuscator-nms-v1_12_R1/src/main/java/net/imprex/orebfuscator/nms/v1_12_R1/NmsManager.java
@@ -98,7 +98,7 @@ public NmsManager(Config config) {
 						.withIsDefaultState(Objects.equals(block.getBlockData(), blockState))
 						.build();
 
-				builder.withBlockState(properties);
+				builder.withBlockState(properties, true);
 			}
 
 			this.registerBlockProperties(builder.build());

diff --git a/...bfuscator-nms-v1_13_R1/src/main/java/net/imprex/orebfuscator/nms/v1_13_R1/NmsManager.java b/...bfuscator-nms-v1_13_R1/src/main/java/net/imprex/orebfuscator/nms/v1_13_R1/NmsManager.java
@@ -87,7 +87,7 @@ public NmsManager(Config config) {
 						.withIsDefaultState(Objects.equals(block.getBlockData(), blockState))
 						.build();
 
-				builder.withBlockState(properties);
+				builder.withBlockState(properties, false);
 			}
 
 			this.registerBlockProperties(builder.build());

diff --git a/...rebfuscator-nms-v1_9_R2/src/main/java/net/imprex/orebfuscator/nms/v1_9_R2/NmsManager.java b/...rebfuscator-nms-v1_9_R2/src/main/java/net/imprex/orebfuscator/nms/v1_9_R2/NmsManager.java
@@ -90,15 +90,14 @@ public NmsManager(Config config) {
 			BlockProperties.Builder builder = BlockProperties.builder(namespacedKey);
 
 			for (IBlockData blockState : possibleBlockStates) {
-
 				BlockStateProperties properties = BlockStateProperties.builder(getBlockId(blockState))
 						.withIsAir(block instanceof BlockAir)
 						.withIsOccluding(material.isOccluding())
 						.withIsBlockEntity(block.isTileEntity())
 						.withIsDefaultState(Objects.equals(block.getBlockData(), blockState))
 						.build();
 
-				builder.withBlockState(properties);
+				builder.withBlockState(properties, true);
 			}
 
 			this.registerBlockProperties(builder.build());