Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#202] deobfuscate block on block fall event #203

Merged
merged 1 commit into from
Mar 8, 2022
Merged

[#202] deobfuscate block on block fall event #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...ms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/AbstractNmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public abstract class AbstractNmsManager implements NmsManager {

private static final byte FLAG_AIR = 1;
private static final byte FLAG_OCCLUDING = 2;
private static final byte FLAG_TILE_ENTITY = 4;
private static final byte FLAG_FALLABLE = 4;
private static final byte FLAG_TILE_ENTITY = 8;

private final AbstractRegionFileCache<?> regionFileCache;
private final Map<Material, Set<Integer>> materialToIds = new HashMap<>();
Expand All @@ -31,10 +32,11 @@ protected final void registerMaterialId(Material material, int id) {
this.materialToIds.computeIfAbsent(material, key -> new HashSet<>()).add(id);
}

protected final void setBlockFlags(int blockId, boolean isAir, boolean canOcclude, boolean isTileEntity) {
protected final void setBlockFlags(int blockId, boolean isAir, boolean canOcclude, boolean canFall, boolean isTileEntity) {
byte flags = this.blockFlags[blockId];
flags |= isAir ? FLAG_AIR : 0;
flags |= canOcclude ? FLAG_OCCLUDING : 0;
flags |= canFall ? FLAG_FALLABLE : 0;
flags |= isTileEntity ? FLAG_TILE_ENTITY : 0;
this.blockFlags[blockId] = flags;
}
Expand All @@ -46,7 +48,7 @@ public final AbstractRegionFileCache<?> getRegionFileCache() {

@Override
public final Set<Integer> getBlockIds(Material material) {
return Collections.unmodifiableSet(this.materialToIds.get(material));
return Collections.unmodifiableSet(this.materialToIds.getOrDefault(material, Collections.emptySet()));
}

@Override
Expand All @@ -59,6 +61,11 @@ public final boolean isOccluding(int blockId) {
return (this.blockFlags[blockId] & FLAG_OCCLUDING) != 0;
}

@Override
public boolean isFallable(int blockId) {
return (this.blockFlags[blockId] & FLAG_FALLABLE) != 0;
}

@Override
public final boolean isBlockEntity(int blockId) {
return (this.blockFlags[blockId] & FLAG_TILE_ENTITY) != 0;
Expand Down
2 changes: 2 additions & 0 deletions ...scator-nms/orebfuscator-nms-api/src/main/java/net/imprex/orebfuscator/nms/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public interface NmsManager {

boolean isOccluding(int blockId);

boolean isFallable(int blockId);

boolean isBlockEntity(int blockId);

ReadOnlyChunk getReadOnlyChunk(World world, int chunkX, int chunkZ);
Expand Down
3 changes: 2 additions & 1 deletion ...bfuscator-nms-v1_10_R1/src/main/java/net/imprex/orebfuscator/nms/v1_10_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_10_R1.Block;
import net.minecraft.server.v1_10_R1.BlockAir;
import net.minecraft.server.v1_10_R1.BlockFalling;
import net.minecraft.server.v1_10_R1.BlockPosition;
import net.minecraft.server.v1_10_R1.Chunk;
import net.minecraft.server.v1_10_R1.ChunkProviderServer;
Expand Down Expand Up @@ -73,7 +74,7 @@ public NmsManager(Config config) {
int blockId = getBlockId(blockData);
this.registerMaterialId(material, blockId);
Block block = blockData.getBlock();
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block.isTileEntity());
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block instanceof BlockFalling, block.isTileEntity());
}
}

Expand Down
3 changes: 2 additions & 1 deletion ...bfuscator-nms-v1_11_R1/src/main/java/net/imprex/orebfuscator/nms/v1_11_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_11_R1.Block;
import net.minecraft.server.v1_11_R1.BlockAir;
import net.minecraft.server.v1_11_R1.BlockFalling;
import net.minecraft.server.v1_11_R1.BlockPosition;
import net.minecraft.server.v1_11_R1.Chunk;
import net.minecraft.server.v1_11_R1.ChunkProviderServer;
Expand Down Expand Up @@ -73,7 +74,7 @@ public NmsManager(Config config) {
int blockId = getBlockId(blockData);
this.registerMaterialId(material, blockId);
Block block = blockData.getBlock();
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block.isTileEntity());
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block instanceof BlockFalling, block.isTileEntity());
}
}

Expand Down
3 changes: 2 additions & 1 deletion ...bfuscator-nms-v1_12_R1/src/main/java/net/imprex/orebfuscator/nms/v1_12_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_12_R1.Block;
import net.minecraft.server.v1_12_R1.BlockAir;
import net.minecraft.server.v1_12_R1.BlockFalling;
import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.Chunk;
import net.minecraft.server.v1_12_R1.ChunkProviderServer;
Expand Down Expand Up @@ -73,7 +74,7 @@ public NmsManager(Config config) {
int blockId = getBlockId(blockData);
this.registerMaterialId(material, blockId);
Block block = blockData.getBlock();
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block.isTileEntity());
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block instanceof BlockFalling, block.isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_13_R1/src/main/java/net/imprex/orebfuscator/nms/v1_13_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_13_R1.Block;
import net.minecraft.server.v1_13_R1.BlockFalling;
import net.minecraft.server.v1_13_R1.BlockPosition;
import net.minecraft.server.v1_13_R1.Chunk;
import net.minecraft.server.v1_13_R1.ChunkProviderServer;
Expand Down Expand Up @@ -71,8 +72,9 @@ public NmsManager(Config config) {
IBlockData blockData = iterator.next();
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.getBlock().isTileEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof BlockFalling, blockData.getBlock().isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_13_R2/src/main/java/net/imprex/orebfuscator/nms/v1_13_R2/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_13_R2.Block;
import net.minecraft.server.v1_13_R2.BlockFalling;
import net.minecraft.server.v1_13_R2.BlockPosition;
import net.minecraft.server.v1_13_R2.Chunk;
import net.minecraft.server.v1_13_R2.ChunkProviderServer;
Expand Down Expand Up @@ -72,8 +73,9 @@ public NmsManager(Config config) {
IBlockData blockData = iterator.next();
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.getBlock().isTileEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof BlockFalling, blockData.getBlock().isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_14_R1/src/main/java/net/imprex/orebfuscator/nms/v1_14_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_14_R1.Block;
import net.minecraft.server.v1_14_R1.BlockFalling;
import net.minecraft.server.v1_14_R1.BlockPosition;
import net.minecraft.server.v1_14_R1.Chunk;
import net.minecraft.server.v1_14_R1.ChunkProviderServer;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (IBlockData blockData : Block.REGISTRY_ID) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.getBlock().isTileEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof BlockFalling, blockData.getBlock().isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_15_R1/src/main/java/net/imprex/orebfuscator/nms/v1_15_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_15_R1.Block;
import net.minecraft.server.v1_15_R1.BlockFalling;
import net.minecraft.server.v1_15_R1.BlockPosition;
import net.minecraft.server.v1_15_R1.Chunk;
import net.minecraft.server.v1_15_R1.ChunkProviderServer;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (IBlockData blockData : Block.REGISTRY_ID) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.getBlock().isTileEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof BlockFalling, blockData.getBlock().isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_16_R1.Block;
import net.minecraft.server.v1_16_R1.BlockFalling;
import net.minecraft.server.v1_16_R1.BlockPosition;
import net.minecraft.server.v1_16_R1.Chunk;
import net.minecraft.server.v1_16_R1.ChunkProviderServer;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (IBlockData blockData : Block.REGISTRY_ID) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.getBlock().isTileEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof BlockFalling, blockData.getBlock().isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_16_R2/src/main/java/net/imprex/orebfuscator/nms/v1_16_R2/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_16_R2.Block;
import net.minecraft.server.v1_16_R2.BlockFalling;
import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R2.Chunk;
import net.minecraft.server.v1_16_R2.ChunkProviderServer;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (IBlockData blockData : Block.REGISTRY_ID) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.getBlock().isTileEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof BlockFalling, blockData.getBlock().isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.imprex.orebfuscator.nms.AbstractRegionFileCache;
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_16_R3.Block;
import net.minecraft.server.v1_16_R3.BlockFalling;
import net.minecraft.server.v1_16_R3.BlockPosition;
import net.minecraft.server.v1_16_R3.Chunk;
import net.minecraft.server.v1_16_R3.ChunkProviderServer;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (IBlockData blockData : Block.REGISTRY_ID) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.getBlock().isTileEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof BlockFalling, blockData.getBlock().isTileEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Fallable;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.LevelChunk;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (BlockState blockData : Block.BLOCK_STATE_REGISTRY) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.hasBlockEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof Fallable, blockData.hasBlockEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Fallable;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.LevelChunk;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (BlockState blockData : Block.BLOCK_STATE_REGISTRY) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.hasBlockEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof Fallable, blockData.hasBlockEntity());
}
}

Expand Down
4 changes: 3 additions & 1 deletion ...bfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Fallable;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.LevelChunk;
Expand Down Expand Up @@ -70,8 +71,9 @@ public NmsManager(Config config) {
for (BlockState blockData : Block.BLOCK_STATE_REGISTRY) {
Material material = CraftBlockData.fromData(blockData).getMaterial();
int blockId = getBlockId(blockData);
Block block = blockData.getBlock();
this.registerMaterialId(material, blockId);
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), blockData.hasBlockEntity());
this.setBlockFlags(blockId, blockData.isAir(), material.isOccluding(), block instanceof Fallable, blockData.hasBlockEntity());
}
}

Expand Down
3 changes: 2 additions & 1 deletion ...rebfuscator-nms-v1_9_R2/src/main/java/net/imprex/orebfuscator/nms/v1_9_R2/NmsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import net.imprex.orebfuscator.nms.ReadOnlyChunk;
import net.minecraft.server.v1_9_R2.Block;
import net.minecraft.server.v1_9_R2.BlockAir;
import net.minecraft.server.v1_9_R2.BlockFalling;
import net.minecraft.server.v1_9_R2.BlockPosition;
import net.minecraft.server.v1_9_R2.Chunk;
import net.minecraft.server.v1_9_R2.ChunkProviderServer;
Expand Down Expand Up @@ -73,7 +74,7 @@ public NmsManager(Config config) {
int blockId = getBlockId(blockData);
this.registerMaterialId(material, blockId);
Block block = blockData.getBlock();
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block.isTileEntity());
this.setBlockFlags(blockId, block instanceof BlockAir, material.isOccluding(), block instanceof BlockFalling, block.isTileEntity());
}
}

Expand Down
4 changes: 4 additions & 0 deletions orebfuscator-plugin/src/main/java/net/imprex/orebfuscator/NmsInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ public static boolean isOccluding(int blockId) {
return instance.isOccluding(blockId);
}

public static boolean isFallable(int blockId) {
return instance.isFallable(blockId);
}

public static boolean isBlockEntity(int blockId) {
return instance.isBlockEntity(blockId);
}
Expand Down
21 changes: 21 additions & 0 deletions ...cator-plugin/src/main/java/net/imprex/orebfuscator/obfuscation/DeobfuscationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package net.imprex.orebfuscator.obfuscation;

import java.util.BitSet;

import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Result;
import org.bukkit.event.EventHandler;
Expand All @@ -10,6 +13,7 @@
import org.bukkit.event.block.BlockBurnEvent;
import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.event.block.BlockExplodeEvent;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.block.BlockPistonExtendEvent;
import org.bukkit.event.block.BlockPistonRetractEvent;
import org.bukkit.event.entity.EntityChangeBlockEvent;
Expand All @@ -35,10 +39,20 @@ public static void createAndRegister(Orebfuscator orebfuscator, DeobfuscationWor
private final OrebfuscatorConfig config;
private final DeobfuscationWorker deobfuscationWorker;

private final BitSet occludingFallable = new BitSet();

private DeobfuscationListener(Orebfuscator orebfuscator, DeobfuscationWorker deobfuscationWorker) {
this.updateSystem = orebfuscator.getUpdateSystem();
this.config = orebfuscator.getOrebfuscatorConfig();
this.deobfuscationWorker = deobfuscationWorker;

for (Material material : Material.values()) {
for (int blockId : NmsInstance.getBlockIds(material)) {
if (NmsInstance.isFallable(blockId) && NmsInstance.isOccluding(blockId)) {
this.occludingFallable.set(material.ordinal());
}
}
}
}

@EventHandler
Expand Down Expand Up @@ -73,6 +87,13 @@ public void onBlockPistonRetract(BlockPistonRetractEvent event) {
this.deobfuscationWorker.deobfuscate(event.getBlocks(), true);
}

@EventHandler
public void onBlockPhysics(BlockPhysicsEvent event) {
if (this.occludingFallable.get(event.getBlock().getType().ordinal())) {
this.deobfuscationWorker.deobfuscate(event.getBlock());
}
}

@EventHandler
public void onEntityExplode(EntityExplodeEvent event) {
this.deobfuscationWorker.deobfuscate(event.blockList(), true);
Expand Down