Skip to content

Commit

Permalink
Remove unused 4096, align flag values, add max flag.
Browse files Browse the repository at this point in the history
  • Loading branch information
@asofold
asofold committed Aug 15, 2018
1 parent 82f50dd commit f6f94d4
Showing 1 changed file with 43 additions and 40 deletions.
83 changes: 43 additions & 40 deletions NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java
View file
Expand Up @@ -487,10 +487,7 @@ public String toString() {
/** Liquid height if no solid/full blocks are above. */
protected static final double LIQUID_HEIGHT_LOWERED = 80000002;

/** The Constant maxBlocks. */
protected static final int maxBlocks = 4096;

/** Properties by block id, might be extended to 4096 later for custom blocks.*/
/** Properties by block type.*/
protected static final Map<Material, BlockProps> blocks = new HashMap<Material, BlockProps>();

/** Map for the tool properties. */
Expand Down Expand Up @@ -658,39 +655,39 @@ public String toString() {
protected static final Map<Material, Long> blockFlags = new HashMap<Material, Long>();

/** Flag position for stairs. */
public static final long F_STAIRS = 0x1L;
public static final long F_STAIRS = 0x1L;

/** The Constant F_LIQUID. */
public static final long F_LIQUID = 0x2L;
public static final long F_LIQUID = 0x2L;
// TODO: maybe remove F_SOLID use (unless for setting F_GROUND on init).
/** Minecraft isSolid result. Used for setting ground flag - Subject to change / rename.*/
public static final long F_SOLID = 0x4L;
public static final long F_SOLID = 0x4L;
/** Compatibility flag: regard this block as passable always. */
public static final long F_IGN_PASSABLE = 0x8L;
public static final long F_IGN_PASSABLE = 0x8L;

/** The Constant F_WATER. */
public static final long F_WATER = 0x10L;
public static final long F_WATER = 0x10L;

/** The Constant F_LAVA. */
public static final long F_LAVA = 0x20L;
public static final long F_LAVA = 0x20L;
/** Override bounding box: 1.5 blocks high, like fences.<br>
* NOTE: This might have relevance for passable later.
*/
public static final long F_HEIGHT150 = 0x40L;
public static final long F_HEIGHT150 = 0x40L;
/** The player can stand on these, sneaking or not. */
public static final long F_GROUND = 0x80L; // TODO:
public static final long F_GROUND = 0x80L; // TODO:
/** Override bounding box: 1 block height.<br>
* NOTE: This should later be ignored by passable, rather.
*/
public static final long F_HEIGHT100 = 0x100L;
public static final long F_HEIGHT100 = 0x100L;
/** Climbable like ladder and vine (allow to land on without taking damage). */
public static final long F_CLIMBABLE = 0x200L;
public static final long F_CLIMBABLE = 0x200L;
/** The block can change shape. This is most likely not 100% accurate... */
public static final long F_VARIABLE = 0x400L;
public static final long F_VARIABLE = 0x400L;
// /** The block has full bounds (0..1), inaccurate! */
// public static final int F_FULL = 0x800;
/** Block has full xz-bounds. */
public static final long F_XZ100 = 0x800L;
public static final long F_XZ100 = 0x800L;

/**
* This flag indicates that everything between the minimum ground height and
Expand All @@ -701,116 +698,122 @@ public String toString() {
* otherwise colliding blocks
* ({@link #isPassableWorkaround(BlockCache, int, int, int, double, double, double, IBlockCacheNode, double, double, double, double)}).
*/
public static final long F_GROUND_HEIGHT = 0x1000L;
public static final long F_GROUND_HEIGHT = 0x1000L;

/**
* The height is assumed to decrease from 1.0 with increasing data value from 0 to 0x7, with 0x7 being the lowest.
* (repeating till 0x15)). 0x8 means falling/full block. This is meant to model flowing water/lava. <br>
* However the hit-box for collision checks will be set to 0.5 height or 1.0 height only.
*/
public static final long F_HEIGHT_8SIM_DEC = 0x2000L;
public static final long F_HEIGHT_8SIM_DEC = 0x2000L;

/**
* The height is assumed to increase with data value up to 0x7, repeating up to 0x15.<br>
* However the hit-box for collision checks will be set to 0.5 height or 1.0 height only,<br>
* as with the 1.4.x snow levels.
*/
public static final long F_HEIGHT_8SIM_INC = 0x4000L;
public static final long F_HEIGHT_8SIM_INC = 0x4000L;


/**
* The height increases with data value (8 heights).<br>
* This is for MC 1.5 snow levels.
*/
public static final long F_HEIGHT_8_INC = 0x8000L;
public static final long F_HEIGHT_8_INC = 0x8000L;

/** All rail types a minecart can move on. */
public static final long F_RAILS = 0x10000L;
public static final long F_RAILS = 0x10000L;

/** ICE. */
public static final long F_ICE = 0x20000L;
public static final long F_ICE = 0x20000L;

/** LEAVES. */
public static final long F_LEAVES = 0x40000L;
public static final long F_LEAVES = 0x40000L;

/** THIN FENCE (glass panes, iron fence). */
public static final long F_THIN_FENCE = 0x80000L;
public static final long F_THIN_FENCE = 0x80000L;

/** Meta-flag to indicate that the (max.-) edges should mean a collision, can be passed to collidesBlock. */
public static final long F_COLLIDE_EDGES = 0x100000L;
public static final long F_COLLIDE_EDGES = 0x100000L;

/** Thick fence (default wooden fence). */
public static final long F_THICK_FENCE = 0x200000L;
public static final long F_THICK_FENCE = 0x200000L;

/** Fence gate style with 0x04 being fully passable. */
public static final long F_PASSABLE_X4 = 0x400000L;
public static final long F_PASSABLE_X4 = 0x400000L;

// TODO: Separate no fall damage flag ? [-> on ground could return "dominating" flags, or extra flags]
/** Like slime block: bounce back 25% of fall height without taking fall damage [TODO: Check/adjust]. */
public static final long F_BOUNCE25 = 0x800000L;
public static final long F_BOUNCE25 = 0x800000L;

/**
* The facing direction is described by the lower 3 data bits in order of
* NSWE, starting at and defaulting to 2, which includes invalid states.
* Main purpose is ladders, no guarantees on defaults for other blocks yet.
*/
public static final long F_FACING_LOW3D2_NSWE = 0x1000000L;
public static final long F_FACING_LOW3D2_NSWE = 0x1000000L;

/**
* The direction the block is attached to is described by the lower 2 bits
* in order of SNEW.
*/
public static final long F_ATTACHED_LOW2_SNEW = 0x2000000L;
public static final long F_ATTACHED_LOW2_SNEW = 0x2000000L;

/**
* The hacky way to force sfNoLowJump when the block at from has this flag.
*/
public static final long F_ALLOW_LOWJUMP = 0x4000000L;
public static final long F_ALLOW_LOWJUMP = 0x4000000L;

/** One eighth block height (0.125). */
public static final long F_HEIGHT8_1 = 0x8000000L;
public static final long F_HEIGHT8_1 = 0x8000000L;

/**
* Fall distance is divided by 2, if a move goes through this medium
* (currently only supports liquid).
*/
public static final long F_FALLDIST_HALF = 0x10000000L;
public static final long F_FALLDIST_HALF = 0x10000000L;

/**
* Fall distance is set to zero, if a move goes through this medium
* (currently only supports liquid).
*/
public static final long F_FALLDIST_ZERO = 0x20000000L;
public static final long F_FALLDIST_ZERO = 0x20000000L;

/**
* Minimum height 15/16 (0.9375 = 1 - 0.0625). <br>
* Only applies with F_GROUND_HEIGHT set.
*/
public static final long F_MIN_HEIGHT16_15 = 0x40000000L;
public static final long F_MIN_HEIGHT16_15 = 0x40000000L;

/**
* Minimum height 1/16 (0.0625). <br>
* Only applies with F_GROUND_HEIGHT set.
*/
// TODO: Lily pad min height of MC versions?
public static final long F_MIN_HEIGHT16_1 = 0x80000000L;
public static final long F_MIN_HEIGHT16_1 = 0x80000000L;

/** CARPET. **/
public static final long F_CARPET = 0x100000000L;
public static final long F_CARPET = 0x100000000L;

/** Cobweb like blocks (adhesive). */
public static final long F_COBWEB = 0x200000000L;
public static final long F_COBWEB = 0x200000000L;

/**
* Block change tracking: ordinary right click interaction (use) can change
* the shape.
*/
public static final long F_VARIABLE_USE = 0x400000000L;
public static final long F_VARIABLE_USE = 0x400000000L;

/**
* Block change tracking: block redstone events can change the shape.
*/
public static final long F_VARIABLE_REDSTONE = 0x800000000L;
public static final long F_VARIABLE_REDSTONE = 0x800000000L;

/**
* Indicator to start recoding towards multiple flag types (shape, moving,
* interaction, block-type/special, ...).
*/
public static final long F_MAX_FLAG = 0x80000000000000L;

// TODO: Convenience constants combining all height / minheight flags.

Expand Down

0 comments on commit f6f94d4

Please sign in to comment.