Skip to content

Commit

Permalink
Update CompatCBDev to MC 1.10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@asofold
asofold committed Jun 9, 2016
1 parent e4f0259 commit f12aa93
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion NCPCompatCBDev/pom.xml
View file
Expand Up @@ -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>
Expand Down
28 changes: 14 additions & 14 deletions NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/BlockCacheCBDev.java
View file
Expand Up @@ -17,25 +17,25 @@
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) {
Expand Down Expand Up @@ -69,7 +69,7 @@ public int fetchData(final int x, final int y, final int 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_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;
Expand All @@ -91,15 +91,15 @@ public boolean standsOnEntity(final Entity entity, final double minX, final doub
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")
final List list = world.getEntities(mcEntity, box);
@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;
}
Expand Down
10 changes: 5 additions & 5 deletions ...rc/main/java/fr/neatmonster/nocheatplus/compat/cbdev/EntityAccessLastPositionAndLook.java
View file
Expand Up @@ -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;
Expand All @@ -25,18 +25,18 @@
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"
});
}

@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);
Expand All @@ -46,7 +46,7 @@ public void getPositionAndLook(final Entity entity, final ISetPositionWithLook l

@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();
Expand Down
64 changes: 32 additions & 32 deletions NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/MCAccessCBDev.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -62,24 +62,24 @@ public MCAccessCBDev() {
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.
Expand All @@ -103,13 +103,13 @@ public MCAccessCBDev() {

@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
Expand All @@ -124,7 +124,7 @@ public BlockCache getBlockCache(final World world) {

@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) {
Expand All @@ -134,7 +134,7 @@ public double getHeight(final Entity entity) {
}
}

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;
Expand All @@ -145,7 +145,7 @@ private net.minecraft.server.v1_9_R2.Material getMaterial(int blockId) {

@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;
}
Expand All @@ -156,7 +156,7 @@ public AlmostBoolean isBlockSolid(final int id) {

@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;
}
Expand Down
2 changes: 1 addition & 1 deletion NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java
View file
Expand Up @@ -119,7 +119,7 @@ private MCAccess getMCAccessCraftBukkit(List<Throwable> throwables) {

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)
Expand Down

0 comments on commit f12aa93

Please sign in to comment.