Merge pull request 'Use combinedIds to hide in TechHider.iBlockDataHidden' (#35) from hotfix/TechHider into main

Reviewed-on: #35
Reviewed-by: Chaoscaot <max@chaoscaot.de>

SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java

@@ -66,8 +66,8 @@ public class BlockIds14 implements BlockIds {
         return getBlock.invoke(null, material);
     }
 
-    private static final Reflection.Method getCombinedId = Reflection.getTypedMethod(TechHider.block, null, int.class, TechHider.iBlockData);
+    @Override
-    private int getCombinedId(Object blockData) {
+    public int getCombinedId(Object blockData) {
         return (int) getCombinedId.invoke(null, blockData);
     }
 }

SpigotCore/SpigotCore_8/src/de/steamwar/techhider/BlockIds8.java

@@ -25,6 +25,12 @@ import java.util.Collections;
 import java.util.Set;
 
 public class BlockIds8 implements BlockIds {
+    @Override
+    public int getCombinedId(Object iBlockData) {
+        int id = (int) getCombinedId.invoke(null, iBlockData); // blockState << 12 | blockId
+        return (id & 4095) | (id >> 12);
+    }
+
     @Override
     @SuppressWarnings("deprecation")
     public int materialToId(Material material) {

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.techhider;
 
+import de.steamwar.Reflection;
 import de.steamwar.core.Core;
 import de.steamwar.core.VersionDependent;
 import org.bukkit.Material;
@@ -28,6 +29,9 @@ import java.util.Set;
 public interface BlockIds {
     BlockIds impl = VersionDependent.getVersionImpl(Core.getInstance());
 
+    Reflection.Method getCombinedId = Reflection.getTypedMethod(TechHider.block, null, int.class, TechHider.iBlockData);
+
+    int getCombinedId(Object iBlockData);
     int materialToId(Material material);
     Set<Integer> materialToAllIds(Material material);
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java

@@ -49,10 +49,8 @@ public class TechHider {
     public static final Class<?> craftMagicNumbers = Reflection.getClass("org.bukkit.craftbukkit.util.CraftMagicNumbers");
     private static final Reflection.Method getBlockByMaterial = Reflection.getTypedMethod(craftMagicNumbers, "getBlock", block, Material.class);
 
-    private static final Reflection.Method getBlockByBlockData = Reflection.getTypedMethod(iBlockData, null, block);
-    private static final Reflection.Method getMaterialByBlock = Reflection.getTypedMethod(craftMagicNumbers, "getMaterial", Material.class, block);
     public boolean iBlockDataHidden(Object iBlockData) {
-        return obfuscate.contains((Material) getMaterialByBlock.invoke(null, getBlockByBlockData.invoke(iBlockData)));
+        return obfuscateIds.contains(BlockIds.impl.getCombinedId(iBlockData));
     }
 
     public static final Object AIR = getBlockDataByBlock.invoke(getBlockByMaterial.invoke(null, Material.AIR));
@@ -66,15 +64,12 @@ public class TechHider {
     @Getter
     private final int obfuscationTargetId;
     @Getter
-    private final Set<Material> obfuscate;
-    @Getter
     private final Set<Integer> obfuscateIds;
     @Getter
     private final Set<String> hiddenBlockEntities;
 
     public TechHider(LocationEvaluator locationEvaluator, Material obfuscationTarget, Set<Material> obfuscate, Set<String> hiddenBlockEntities) {
         this.locationEvaluator = locationEvaluator;
-        this.obfuscate = obfuscate;
         this.obfuscateIds = obfuscate.stream().flatMap(m -> BlockIds.impl.materialToAllIds(m).stream()).collect(Collectors.toSet());
         this.hiddenBlockEntities = hiddenBlockEntities;
         this.obfuscationTarget = getBlockDataByBlock.invoke(getBlockByMaterial.invoke(null, obfuscationTarget));