Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-10-04 09:27:30 +02:00
Code Issues Projects Releases Wiki Activity

Update CompatCBDev to MC 1.10.

Browse Source
This commit is contained in:
asofold 2016-06-09 13:02:37 +02:00
parent e4f02595ba
commit f12aa93454
5 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPCompatCBDev/pom.xml
View File

@ -23,7 +23,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
<version>1.10-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

28
NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/BlockCacheCBDev.java
View File

@ -17,25 +17,25 @@ package fr.neatmonster.nocheatplus.compat.cbdev;
import java.util.Iterator;
import java.util.List;
import net.minecraft.server.v1_9_R2.AxisAlignedBB;
import net.minecraft.server.v1_9_R2.BlockPosition;
import net.minecraft.server.v1_9_R2.EntityBoat;
import net.minecraft.server.v1_9_R2.EntityShulker;
import net.minecraft.server.v1_9_R2.EnumDirection;
import net.minecraft.server.v1_9_R2.IBlockAccess;
import net.minecraft.server.v1_9_R2.IBlockData;
import net.minecraft.server.v1_9_R2.TileEntity;
import net.minecraft.server.v1_10_R1.AxisAlignedBB;
import net.minecraft.server.v1_10_R1.BlockPosition;
import net.minecraft.server.v1_10_R1.EntityBoat;
import net.minecraft.server.v1_10_R1.EntityShulker;
import net.minecraft.server.v1_10_R1.EnumDirection;
import net.minecraft.server.v1_10_R1.IBlockAccess;
import net.minecraft.server.v1_10_R1.IBlockData;
import net.minecraft.server.v1_10_R1.TileEntity;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
import org.bukkit.entity.Entity;
import fr.neatmonster.nocheatplus.utilities.BlockCache;
public class BlockCacheCBDev extends BlockCache implements IBlockAccess {
protected net.minecraft.server.v1_9_R2.WorldServer world;
protected net.minecraft.server.v1_10_R1.WorldServer world;
protected World bukkitWorld;
public BlockCacheCBDev(World world) {
@ -69,7 +69,7 @@ public class BlockCacheCBDev extends BlockCache implements IBlockAccess {
@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_9_R2.Block block = net.minecraft.server.v1_9_R2.Block.getById(id);
final net.minecraft.server.v1_10_R1.Block block = net.minecraft.server.v1_10_R1.Block.getById(id);
if (block == null) {
// TODO: Convention for null blocks -> full ?
return null;
@ -91,7 +91,7 @@ public class BlockCacheCBDev extends BlockCache implements IBlockAccess {
try{
// TODO: Find some simplification!
final net.minecraft.server.v1_9_R2.Entity mcEntity = ((CraftEntity) entity).getHandle();
final net.minecraft.server.v1_10_R1.Entity mcEntity = ((CraftEntity) entity).getHandle();
final AxisAlignedBB box = new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ);
@SuppressWarnings("rawtypes")
@ -99,7 +99,7 @@ public class BlockCacheCBDev extends BlockCache implements IBlockAccess {
@SuppressWarnings("rawtypes")
final Iterator iterator = list.iterator();
while (iterator.hasNext()) {
final net.minecraft.server.v1_9_R2.Entity other = (net.minecraft.server.v1_9_R2.Entity) iterator.next();
final net.minecraft.server.v1_10_R1.Entity other = (net.minecraft.server.v1_10_R1.Entity) iterator.next();
if (mcEntity == other || !(other instanceof EntityBoat) && !(other instanceof EntityShulker)) { // && !(other instanceof EntityMinecart)) continue;
continue;
}

10
NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/EntityAccessLastPositionAndLook.java
View File

@ -14,7 +14,7 @@
*/
package fr.neatmonster.nocheatplus.compat.cbdev;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
import org.bukkit.entity.Entity;
import fr.neatmonster.nocheatplus.components.location.IEntityAccessLastPositionAndLook;
@ -25,10 +25,10 @@ import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
public class EntityAccessLastPositionAndLook implements IEntityAccessLastPositionAndLook {
public EntityAccessLastPositionAndLook() {
ReflectionUtil.checkMembers(net.minecraft.server.v1_9_R2.Entity.class, double.class, new String[] {
ReflectionUtil.checkMembers(net.minecraft.server.v1_10_R1.Entity.class, double.class, new String[] {
"lastX", "lastY", "lastZ"
});
ReflectionUtil.checkMembers(net.minecraft.server.v1_9_R2.Entity.class, float.class, new String[] {
ReflectionUtil.checkMembers(net.minecraft.server.v1_10_R1.Entity.class, float.class, new String[] {
"lastYaw", "lastPitch"
});
}
@ -36,7 +36,7 @@ public class EntityAccessLastPositionAndLook implements IEntityAccessLastPositio
@Override
public void getPositionAndLook(final Entity entity, final ISetPositionWithLook location) {
// TODO: Error handling / conventions.
final net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
final net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle();
location.setX(nmsEntity.lastX);
location.setY(nmsEntity.lastY);
location.setZ(nmsEntity.lastZ);
@ -46,7 +46,7 @@ public class EntityAccessLastPositionAndLook implements IEntityAccessLastPositio
@Override
public void setPositionAndLook(Entity entity, IGetPositionWithLook location) {
final net.minecraft.server.v1_9_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle();
final net.minecraft.server.v1_10_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle();
nmsEntity.lastX = location.getX();
nmsEntity.lastY = location.getY();
nmsEntity.lastZ = location.getZ();

64
NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/MCAccessCBDev.java
View File

@ -14,27 +14,27 @@
*/
package fr.neatmonster.nocheatplus.compat.cbdev;
import net.minecraft.server.v1_9_R2.AttributeInstance;
import net.minecraft.server.v1_9_R2.AttributeModifier;
import net.minecraft.server.v1_9_R2.AxisAlignedBB;
import net.minecraft.server.v1_9_R2.Block;
import net.minecraft.server.v1_9_R2.BlockPosition;
import net.minecraft.server.v1_9_R2.DamageSource;
import net.minecraft.server.v1_9_R2.EntityComplexPart;
import net.minecraft.server.v1_9_R2.EntityPlayer;
import net.minecraft.server.v1_9_R2.GenericAttributes;
import net.minecraft.server.v1_9_R2.IBlockAccess;
import net.minecraft.server.v1_9_R2.IBlockData;
import net.minecraft.server.v1_9_R2.MobEffectList;
import net.minecraft.server.v1_10_R1.AttributeInstance;
import net.minecraft.server.v1_10_R1.AttributeModifier;
import net.minecraft.server.v1_10_R1.AxisAlignedBB;
import net.minecraft.server.v1_10_R1.Block;
import net.minecraft.server.v1_10_R1.BlockPosition;
import net.minecraft.server.v1_10_R1.DamageSource;
import net.minecraft.server.v1_10_R1.EntityComplexPart;
import net.minecraft.server.v1_10_R1.EntityPlayer;
import net.minecraft.server.v1_10_R1.GenericAttributes;
import net.minecraft.server.v1_10_R1.IBlockAccess;
import net.minecraft.server.v1_10_R1.IBlockData;
import net.minecraft.server.v1_10_R1.MobEffectList;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.command.CommandMap;
import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@ -62,24 +62,24 @@ public class MCAccessCBDev implements MCAccess {
if (ReflectionUtil.getConstructor(BlockPosition.class, int.class, int.class, int.class) == null) {
throw new RuntimeException();
}
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R2.EntityLiving.class,
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_10_R1.EntityLiving.class,
new String[]{"getHeadHeight"}, float.class);
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R2.EntityPlayer.class,
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_10_R1.EntityPlayer.class,
new String[]{"getHealth"}, float.class);
ReflectionUtil.checkMembers(net.minecraft.server.v1_9_R2.AxisAlignedBB.class, double.class,
ReflectionUtil.checkMembers(net.minecraft.server.v1_10_R1.AxisAlignedBB.class, double.class,
"a", "b", "c", "d", "e", "f");
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R2.AttributeInstance.class,
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_10_R1.AttributeInstance.class,
new String[]{"b"}, double.class);
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R2.AttributeModifier.class,
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_10_R1.AttributeModifier.class,
new String[]{"c"}, int.class);
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R2.AttributeModifier.class,
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_10_R1.AttributeModifier.class,
new String[]{"d"}, double.class);
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_9_R2.Material.class,
ReflectionUtil.checkMethodReturnTypesNoArgs(net.minecraft.server.v1_10_R1.Material.class,
new String[]{"isSolid", "isLiquid"}, boolean.class);
// TODO: Confine the following by types as well.
ReflectionUtil.checkMembers("net.minecraft.server.v1_9_R2.",
ReflectionUtil.checkMembers("net.minecraft.server.v1_10_R1.",
new String[] {"Entity" , "length", "width", "locY"});
ReflectionUtil.checkMembers("net.minecraft.server.v1_9_R2.",
ReflectionUtil.checkMembers("net.minecraft.server.v1_10_R1.",
new String[] {"EntityPlayer" , "dead", "deathTicks", "invulnerableTicks"});
// obc: getHandle() for CraftWorld, CraftPlayer, CraftEntity.
@ -103,13 +103,13 @@ public class MCAccessCBDev implements MCAccess {
@Override
public String getMCVersion() {
// 1.9.4 (1_9_R2)
return "1.9.4";
// 1.10 (1_10_R1)
return "1.10";
}
@Override
public String getServerVersionTag() {
return "Spigot-CB-1.9_R2";
return "Spigot-CB-1.10_R1";
}
@Override
@ -124,7 +124,7 @@ public class MCAccessCBDev implements MCAccess {
@Override
public double getHeight(final Entity entity) {
final net.minecraft.server.v1_9_R2.Entity mcEntity = ((CraftEntity) entity).getHandle();
final net.minecraft.server.v1_10_R1.Entity mcEntity = ((CraftEntity) entity).getHandle();
AxisAlignedBB boundingBox = mcEntity.getBoundingBox();
final double entityHeight = Math.max(mcEntity.length, Math.max(mcEntity.getHeadHeight(), boundingBox.e - boundingBox.b));
if (entity instanceof LivingEntity) {
@ -134,7 +134,7 @@ public class MCAccessCBDev implements MCAccess {
}
}
private net.minecraft.server.v1_9_R2.Material getMaterial(int blockId) {
private net.minecraft.server.v1_10_R1.Material getMaterial(int blockId) {
final Block block = Block.getById(blockId);
if (block == null) {
return null;
@ -145,7 +145,7 @@ public class MCAccessCBDev implements MCAccess {
@Override
public AlmostBoolean isBlockSolid(final int id) {
final net.minecraft.server.v1_9_R2.Material material = getMaterial(id);
final net.minecraft.server.v1_10_R1.Material material = getMaterial(id);
if (material == null) {
return AlmostBoolean.MAYBE;
}
@ -156,7 +156,7 @@ public class MCAccessCBDev implements MCAccess {
@Override
public AlmostBoolean isBlockLiquid(final int id) {
final net.minecraft.server.v1_9_R2.Material material = getMaterial(id);
final net.minecraft.server.v1_10_R1.Material material = getMaterial(id);
if (material == null) {
return AlmostBoolean.MAYBE;
}

2
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java
View File

@ -119,7 +119,7 @@ public class MCAccessFactory {
final String[] classNames = new String[] {
// Current DEV / LATEST: CB (Spigot)
//"fr.neatmonster.nocheatplus.compat.cbdev.MCAccessCBDev", // latest / tests.
"fr.neatmonster.nocheatplus.compat.cbdev.MCAccessCBDev", // latest / tests.
// Dedicated: CB (Spigot)
"fr.neatmonster.nocheatplus.compat.spigotcb1_9_R2.MCAccessSpigotCB1_9_R2", // 1.9.4 (1_9_R2)