Upstream
/
SongodaCore
mirror of https://github.com/songoda/SongodaCore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Partially reverts "Replace #updateAdjacentComparators implementation(+ move to NMS modules)" 

This partially reverts commit 3d20f439e1.
This commit is contained in:
Christian Koop 2023-05-06 21:31:13 +02:00
parent dc82a6ba5c
commit 50d5784da8
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
1 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Core/src/main/java/com/songoda/core/utils/BlockUtils.java
View File

@ -5,11 +5,13 @@ import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.core.compatibility.MethodMapping;
import com.songoda.core.compatibility.ServerVersion;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.EnumSet;
@ -326,6 +328,65 @@ public class BlockUtils {
return null;
}
/* Only to be used by #updateAdjacentComparators */
private static Method chunkToNmsChunk, nmsChunkGetWorld, craftBlockGetPosition, craftBlockBlockDataGetter, blockDataGetBlock, craftMagicNumbersGetBlockByMaterial, nmsWorldUpdateAdjacentComparators;
/* Only to be used by #updateAdjacentComparators */
private static Constructor<?> blockPositionConstructor;
/**
* Manually trigger the updateAdjacentComparators method for containers
*
* @param loc The Location of the container
*/
public static void updateAdjacentComparators(Location loc) {
if (loc == null || loc.getWorld() == null) {
return;
}
Block craftBlock = loc.getBlock();
try {
if (chunkToNmsChunk == null) {
chunkToNmsChunk = MethodMapping.CB_GENERIC__GET_HANDLE.getMethod(ClassMapping.CRAFT_CHUNK.getClazz());
nmsChunkGetWorld = MethodMapping.MC_CHUNK__GET_WORLD.getMethod(chunkToNmsChunk.getReturnType());
craftBlockGetPosition = MethodMapping.CB_BLOCK__GET_POSITION.getMethod(ClassMapping.CRAFT_BLOCK.getClazz());
if (craftBlockGetPosition == null) {
blockPositionConstructor = ClassMapping.BLOCK_POSITION.getClazz().getConstructor(double.class, double.class, double.class);
}
nmsWorldUpdateAdjacentComparators = MethodMapping.WORLD__UPDATE_ADJACENT_COMPARATORS.getMethod(ClassMapping.WORLD.getClazz());
craftBlockBlockDataGetter = MethodMapping.CB_BLOCK__GET_NMS.getMethod(ClassMapping.CRAFT_BLOCK.getClazz());
blockDataGetBlock = MethodMapping.I_BLOCK_DATA__GET_BLOCK.getMethod(ClassMapping.I_BLOCK_DATA.getClazz());
if (craftBlockBlockDataGetter == null || blockDataGetBlock == null) {
craftMagicNumbersGetBlockByMaterial = MethodMapping.CRAFT_MAGIC_NUMBERS__GET_BLOCK__MATERIAL.getMethod(ClassMapping.CRAFT_MAGIC_NUMBERS.getClazz());
}
}
Object nmsChunk = chunkToNmsChunk.invoke(loc.getChunk());
Object nmsWorld = nmsChunkGetWorld.invoke(nmsChunk);
Object blockPosition;
if (craftBlockGetPosition != null) {
blockPosition = craftBlockGetPosition.invoke(craftBlock);
} else {
blockPosition = blockPositionConstructor.newInstance(loc.getX(), loc.getY(), loc.getZ());
}
Object nmsBlock;
if (craftBlockBlockDataGetter != null) {
nmsBlock = blockDataGetBlock.invoke(craftBlockBlockDataGetter.invoke(craftBlock));
} else {
nmsBlock = craftMagicNumbersGetBlockByMaterial.invoke(null, craftBlock.getType());
}
nmsWorldUpdateAdjacentComparators.invoke(nmsWorld, blockPosition, nmsBlock);
} catch (NullPointerException | ReflectiveOperationException ex) {
ex.printStackTrace();
}
}
/* Only to be used by #setBlockFast */
private static Class<?> clazzIBlockData, clazzBlocks, clazzCraftWorld, clazzBlockPosition;
/* Only to be used by #setBlockFast */