Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Make it 1.8 compatible

Browse Source
This commit is contained in:
Lixfel
2025-04-05 18:02:48 +02:00
parent a6c46d0270
commit 812e78d277
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java
+2 -2
View File
@@ -66,8 +66,8 @@ public class BlockIds14 implements BlockIds {
return getBlock.invoke(null, material); 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); return (int) getCombinedId.invoke(null, blockData);
} }
} }
SpigotCore/SpigotCore_8/src/de/steamwar/techhider/BlockIds8.java
+6
View File
@@ -25,6 +25,12 @@ import java.util.Collections;
import java.util.Set; import java.util.Set;
public class BlockIds8 implements BlockIds { 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 @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public int materialToId(Material material) { public int materialToId(Material material) {
SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java
+4
View File
@@ -19,6 +19,7 @@
package de.steamwar.techhider; package de.steamwar.techhider;
import de.steamwar.Reflection;
import de.steamwar.core.Core; import de.steamwar.core.Core;
import de.steamwar.core.VersionDependent; import de.steamwar.core.VersionDependent;
import org.bukkit.Material; import org.bukkit.Material;
@@ -28,6 +29,9 @@ import java.util.Set;
public interface BlockIds { public interface BlockIds {
BlockIds impl = VersionDependent.getVersionImpl(Core.getInstance()); 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); int materialToId(Material material);
Set<Integer> materialToAllIds(Material material); Set<Integer> materialToAllIds(Material material);
} }
SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
+1 -2
View File
@@ -49,9 +49,8 @@ public class TechHider {
public static final Class<?> craftMagicNumbers = Reflection.getClass("org.bukkit.craftbukkit.util.CraftMagicNumbers"); 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 getBlockByMaterial = Reflection.getTypedMethod(craftMagicNumbers, "getBlock", block, Material.class);
private static final Reflection.Method getCombinedIdByIBlockData = Reflection.getTypedMethod(block, null, int.class, iBlockData);
public boolean iBlockDataHidden(Object iBlockData) { public boolean iBlockDataHidden(Object iBlockData) {
return obfuscateIds.contains(getCombinedIdByIBlockData.invoke(null, iBlockData)); return obfuscateIds.contains(BlockIds.impl.getCombinedId(iBlockData));
} }
public static final Object AIR = getBlockDataByBlock.invoke(getBlockByMaterial.invoke(null, Material.AIR)); public static final Object AIR = getBlockDataByBlock.invoke(getBlockByMaterial.invoke(null, Material.AIR));