Add dedicated compatibility module for CB 3100 (MC 1.7.10).

NCPCompatCB3100/pom.xml

@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>fr.neatmonster</groupId>
+  <artifactId>ncpcompatcb3100</artifactId>
+  <packaging>jar</packaging>
+  <name>NCPCompatCB3100</name>
+  <version>static</version>
+
+  <parent>
+    <groupId>fr.neatmonster</groupId>
+    <artifactId>nocheatplus-parent</artifactId>
+    <version>static</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+    	<groupId>fr.neatmonster</groupId>
+    	<artifactId>ncpcore</artifactId>
+    	<version>static</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.bukkit</groupId>
+    	<artifactId>craftbukkit</artifactId>
+    	<version>1.7.10-R0.1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <description>Compatibility for CraftBukkit build 3100 (MC 1.7.10).
+
+Version updating is done for the NoCheatPlus sub-module.
+</description>
+</project>

NCPCompatCB3100/src/main/java/fr/neatmonster/nocheatplus/compat/cb3100/BlockCacheCB3100.java

@@ -0,0 +1,124 @@
+package fr.neatmonster.nocheatplus.compat.cb3100;
+
+import java.util.Iterator;
+import java.util.List;
+
+import net.minecraft.server.v1_7_R4.AxisAlignedBB;
+import net.minecraft.server.v1_7_R4.Block;
+import net.minecraft.server.v1_7_R4.EntityBoat;
+import net.minecraft.server.v1_7_R4.IBlockAccess;
+import net.minecraft.server.v1_7_R4.TileEntity;
+
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity;
+import org.bukkit.entity.Entity;
+
+import fr.neatmonster.nocheatplus.utilities.BlockCache;
+
+public class BlockCacheCB3100 extends BlockCache implements IBlockAccess{
+
+    /** Box for one time use, no nesting, no extra storing this(!). */
+    protected static final AxisAlignedBB useBox = AxisAlignedBB.a(0, 0, 0, 0, 0, 0);
+
+    protected net.minecraft.server.v1_7_R4.WorldServer world;
+
+    public BlockCacheCB3100(World world) {
+        setAccess(world);
+    }
+
+    @Override
+    public void setAccess(World world) {
+        if (world != null) {
+            this.maxBlockY = world.getMaxHeight() - 1;
+            this.world = ((CraftWorld) world).getHandle();
+        } else {
+            this.world = null;
+        }
+    }
+
+    @Override
+    public int fetchTypeId(final int x, final int y, final int z) {
+        return world.getTypeId(x, y, z);
+    }
+
+    @Override
+    public int fetchData(final int x, final int y, final int z) {
+        return world.getData(x, y, z);
+    }
+
+    @Override
+    public double[] fetchBounds(final int x, final int y, final int z){
+        final int id = getTypeId(x, y, z);		
+        final net.minecraft.server.v1_7_R4.Block block = net.minecraft.server.v1_7_R4.Block.getById(id);
+        if (block == null) {
+            // TODO: Convention for null bounds -> full ?
+            return null;
+        }
+        block.updateShape(this, x, y, z);
+
+        // minX, minY, minZ, maxX, maxY, maxZ
+        return new double[]{block.x(), block.z(), block.B(), block.y(),  block.A(),  block.C()};
+    }
+
+    @Override
+    public boolean standsOnEntity(final Entity entity, final double minX, final double minY, final double minZ, final double maxX, final double maxY, final double maxZ){
+        try{
+            // TODO: Find some simplification!
+
+            final net.minecraft.server.v1_7_R4.Entity mcEntity  = ((CraftEntity) entity).getHandle();
+
+            final AxisAlignedBB box = useBox.b(minX, minY, minZ, maxX, maxY, maxZ);
+            @SuppressWarnings("rawtypes")
+            final List list = world.getEntities(mcEntity, box);
+            @SuppressWarnings("rawtypes")
+            final Iterator iterator = list.iterator();
+            while (iterator.hasNext()) {
+                final net.minecraft.server.v1_7_R4.Entity other = (net.minecraft.server.v1_7_R4.Entity) iterator.next();
+                if (!(other instanceof EntityBoat)){ // && !(other instanceof EntityMinecart)) continue;
+                    continue;
+                }
+                if (minY >= other.locY && minY - other.locY <= 0.7){
+                    return true;
+                }
+                // Still check this for some reason.
+                final AxisAlignedBB otherBox = other.boundingBox;
+                if (box.a > otherBox.d || box.d < otherBox.a || box.b > otherBox.e || box.e < otherBox.b || box.c > otherBox.f || box.f < otherBox.c) {
+                    continue;
+                }
+                else {
+                    return true;
+                }
+            }
+        }
+        catch (Throwable t){
+            // Ignore exceptions (Context: DisguiseCraft).
+        }
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see fr.neatmonster.nocheatplus.utilities.BlockCache#cleanup()
+     */
+    @Override
+    public void cleanup() {
+        super.cleanup();
+        world = null;
+    }
+
+    @Override
+    public TileEntity getTileEntity(final int x, final int y, final int z) {
+        return world.getTileEntity(x, y, z);
+    }
+
+    @Override
+    public int getBlockPower(final int arg0, final int arg1, final int arg2, final int arg3) {
+        return world.getBlockPower(arg0, arg1, arg2, arg3);
+    }
+
+    @Override
+    public Block getType(int x, int y, int z) {
+        return world.getType(x, y, z);
+    }
+
+}

NCPCompatCB3100/src/main/java/fr/neatmonster/nocheatplus/compat/cb3100/MCAccessCB3100.java

@@ -0,0 +1,188 @@
+package fr.neatmonster.nocheatplus.compat.cb3100;
+
+import net.minecraft.server.v1_7_R4.AxisAlignedBB;
+import net.minecraft.server.v1_7_R4.Block;
+import net.minecraft.server.v1_7_R4.DamageSource;
+import net.minecraft.server.v1_7_R4.EntityComplexPart;
+import net.minecraft.server.v1_7_R4.EntityPlayer;
+import net.minecraft.server.v1_7_R4.MobEffectList;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.command.CommandMap;
+import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+
+import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
+import fr.neatmonster.nocheatplus.compat.MCAccess;
+import fr.neatmonster.nocheatplus.utilities.BlockCache;
+import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
+
+public class MCAccessCB3100 implements MCAccess{
+	
+	/**
+	 * Constructor to let it fail.
+	 */
+	public MCAccessCB3100() {
+		getCommandMap();
+		ReflectionUtil.checkMembers("net.minecraft.server.v1_7_R4.", new String[] {"Entity" , "dead"});
+		// block bounds, original: minX, maxX, minY, maxY, minZ, maxZ
+		ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_7_R4.Block.class, 
+				new String[]{"x", "y", "z", "A", "B", "C"}, double.class);
+		// TODO: Nail it down further.
+	}
+
+	@Override
+	public String getMCVersion() {
+		// 1_7_R4
+		return "1.7.10";
+	}
+
+	@Override
+	public String getServerVersionTag() {
+		return "CB3100";
+	}
+
+	@Override
+	public CommandMap getCommandMap() {
+		return ((CraftServer) Bukkit.getServer()).getCommandMap();
+	}
+
+	@Override
+	public BlockCache getBlockCache(final World world) {
+		return new BlockCacheCB3100(world);
+	}
+
+	@Override
+	public double getHeight(final Entity entity) {
+		final net.minecraft.server.v1_7_R4.Entity mcEntity = ((CraftEntity) entity).getHandle();
+		final double entityHeight = Math.max(mcEntity.length, Math.max(mcEntity.height, mcEntity.boundingBox.e - mcEntity.boundingBox.b));
+		if (entity instanceof LivingEntity) {
+			return Math.max(((LivingEntity) entity).getEyeHeight(), entityHeight);
+		} else return entityHeight;
+	}
+
+	@Override
+	public AlmostBoolean isBlockSolid(final int id) {
+		final Block block = Block.getById(id);
+		if (block == null || block.getMaterial() == null) {
+			return AlmostBoolean.MAYBE;
+		}
+		else {
+			return AlmostBoolean.match(block.getMaterial().isSolid());
+		}
+	}
+
+	@Override
+	public AlmostBoolean isBlockLiquid(final int id) {
+		final Block block = Block.getById(id);
+		if (block == null || block.getMaterial() == null) {
+			return AlmostBoolean.MAYBE;
+		}
+		else {
+			return AlmostBoolean.match(block.getMaterial().isLiquid());
+		}
+	}
+
+	@Override
+	public double getWidth(final Entity entity) {
+		return ((CraftEntity) entity).getHandle().width;
+	}
+
+	@Override
+	public AlmostBoolean isIllegalBounds(final Player player) {
+		final EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
+		if (entityPlayer.dead) {
+			return AlmostBoolean.NO;
+		}
+		// TODO: Does this need a method call for the "real" box? Might be no problem during moving events, though.
+		final AxisAlignedBB box = entityPlayer.boundingBox;
+		if (!entityPlayer.isSleeping()) {
+			// This can not really test stance but height of bounding box.
+			final double dY = Math.abs(box.e - box.b);
+			if (dY > 1.8) {
+				return AlmostBoolean.YES; // dY > 1.65D || 
+			}
+			if (dY < 0.1D && entityPlayer.length >= 0.1) {
+				return AlmostBoolean.YES;
+			}
+		}
+		return AlmostBoolean.MAYBE;
+	}
+
+	@Override
+	public double getJumpAmplifier(final Player player) {
+		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+		if (mcPlayer.hasEffect(MobEffectList.JUMP)) {
+			return mcPlayer.getEffect(MobEffectList.JUMP).getAmplifier();
+		}
+		else {
+			return Double.NEGATIVE_INFINITY;
+		}
+	}
+
+	@Override
+	public double getFasterMovementAmplifier(final Player player) {
+		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+		if (mcPlayer.hasEffect(MobEffectList.FASTER_MOVEMENT)) {
+			return mcPlayer.getEffect(MobEffectList.FASTER_MOVEMENT).getAmplifier();
+		}
+		else {
+			return Double.NEGATIVE_INFINITY;
+		}
+	}
+
+	@Override
+	public int getInvulnerableTicks(final Player player) {
+		return ((CraftPlayer) player).getHandle().invulnerableTicks;
+	}
+
+	@Override
+	public void setInvulnerableTicks(final Player player, final int ticks) {
+		((CraftPlayer) player).getHandle().invulnerableTicks = ticks;
+	}
+
+	@Override
+	public void dealFallDamage(final Player player, final double damage) {
+		((CraftPlayer) player).getHandle().damageEntity(DamageSource.FALL, (float) damage);
+	}
+
+	@Override
+	public boolean isComplexPart(final Entity entity) {
+		return ((CraftEntity) entity).getHandle() instanceof EntityComplexPart;
+	}
+
+	@Override
+	public boolean shouldBeZombie(final Player player) {
+		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+		return !mcPlayer.dead && mcPlayer.getHealth() <= 0.0f ;
+	}
+
+	@Override
+	public void setDead(final Player player, final int deathTicks) {
+		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+        mcPlayer.deathTicks = deathTicks;
+        mcPlayer.dead = true;
+	}
+	
+	@Override
+	public boolean hasGravity(final Material mat) {
+		// TODO: Test/check.
+		return mat.hasGravity();
+	}
+	
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
+	
+}

NCPCompatCBDev/pom.xml

@@ -33,6 +33,7 @@ Version updating is done for the NoCheatPlus sub-module.
 To add a new compat module three other pom.xml files have to be modified:
 - Root pom (parent): Add as module.
 - NCPPlugin: Add as dependency.
-- NochCheatPlus: Add as include (source).
-</description>
+- NoCheatPlus: Add as include (source).
+
+The NCPPlugin sub-project contains the MCAccessFactory.</description>
 </project>

NCPPlugin/pom.xml

@@ -93,6 +93,11 @@
     	<artifactId>ncpcompatcb3043</artifactId>
     	<version>static</version>
     </dependency>
+    <dependency>
+        <groupId>fr.neatmonster</groupId>
+        <artifactId>ncpcompatcb3100</artifactId>
+        <version>static</version>
+    </dependency>
     <dependency>
     	<groupId>fr.neatmonster</groupId>
     	<artifactId>ncpcompatcbdev</artifactId>

NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java

@@ -18,7 +18,7 @@ import fr.neatmonster.nocheatplus.compat.cb2882.MCAccessCB2882;
 import fr.neatmonster.nocheatplus.compat.cb2922.MCAccessCB2922;
 import fr.neatmonster.nocheatplus.compat.cb3026.MCAccessCB3026;
 import fr.neatmonster.nocheatplus.compat.cb3043.MCAccessCB3043;
-import fr.neatmonster.nocheatplus.compat.cbdev.MCAccessCBDev;
+import fr.neatmonster.nocheatplus.compat.cb3100.MCAccessCB3100;
 import fr.neatmonster.nocheatplus.compat.glowstone.MCAccessGlowstone;
 import fr.neatmonster.nocheatplus.config.ConfPaths;
 import fr.neatmonster.nocheatplus.config.ConfigManager;
@@ -114,14 +114,22 @@ public class MCAccessFactory {
         // TEMP //
         // Only add as long as no stable module has been added.
         // 1.7.10
+//        try{
+//            return new MCAccessCBDev();
+//        }
+//        catch(Throwable t) {
+//            throwables.add(t);
+//        };
+        // TEMP END //
+        
+     // 1.7.10
         try{
-            return new MCAccessCBDev();
+            return new MCAccessCB3100();
         }
         catch(Throwable t) {
             throwables.add(t);
         };
-        // TEMP END //
-
+        
         // 1.7.8|1.7.9
         try{
             return new MCAccessCB3043();

NoCheatPlus/pom.xml

@@ -102,6 +102,7 @@
                   <include>fr.neatmonster:ncpcompatcb2922</include>
                   <include>fr.neatmonster:ncpcompatcb3026</include>
                   <include>fr.neatmonster:ncpcompatcb3043</include>
+                  <include>fr.neatmonster:ncpcompatcb3100</include>
                   <include>fr.neatmonster:ncpcompatcbdev</include>
                   <include>fr.neatmonster:ncpcompatprotocollib</include>
                   <include>fr.neatmonster:ncpcompatglowstone</include>

pom.xml

@@ -30,6 +30,7 @@
     <module>NCPCompatCB2922</module>
     <module>NCPCompatCB3026</module>
     <module>NCPCompatCB3043</module>
+    <module>NCPCompatCB3100</module>
     <module>NCPCompatCBDev</module>
     <module>NCPCompatProtocolLib</module>
     <module>NCPCompatGlowstone</module>