From 3d773c694421f14fc067696eca77cb05f1faf11c Mon Sep 17 00:00:00 2001 From: asofold Date: Fri, 21 Dec 2012 10:44:28 +0100 Subject: [PATCH] [INSTABLE] Add support for MC1.4.6. --- .../compat/cb2512/BlockCacheCB2512.java | 2 +- NCPCompatMC1_4_6/pom.xml | 37 +++++ .../compat/cb2512/BlockCacheMC1_4_6.java | 113 +++++++++++++ .../compat/cb2512/MCAccessMC1_4_6.java | 154 ++++++++++++++++++ NCPPlugin/pom.xml | 11 +- .../nocheatplus/compat/MCAccessFactory.java | 6 +- pom.xml | 1 + 7 files changed, 319 insertions(+), 5 deletions(-) create mode 100644 NCPCompatMC1_4_6/pom.xml create mode 100644 NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheMC1_4_6.java create mode 100644 NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessMC1_4_6.java diff --git a/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheCB2512.java b/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheCB2512.java index 0bbcf7fd..d2b07d34 100644 --- a/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheCB2512.java +++ b/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheCB2512.java @@ -17,7 +17,7 @@ import org.bukkit.entity.EntityType; import fr.neatmonster.nocheatplus.utilities.BlockCache; -public class BlockCacheCB2512 extends BlockCache implements IBlockAccess{ // TODO: let it implement IBlockAccess ! +public class BlockCacheCB2512 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); diff --git a/NCPCompatMC1_4_6/pom.xml b/NCPCompatMC1_4_6/pom.xml new file mode 100644 index 00000000..812ecab9 --- /dev/null +++ b/NCPCompatMC1_4_6/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + fr.neatmonster + ncpcompatmc1_4_6 + jar + NCPCompatMC1_4_6 + 1.0.0 + + + fr.neatmonster + nocheatplus-parent + 1.0.1 + + + + + fr.neatmonster + ncpcommons + 1.0.0 + + + fr.neatmonster + ncpcompat + 1.0.0 + + + org.bukkit + craftbukkit + 1.4.6-R0.1-SNAPSHOT + + + + Compatibility since MC 1.4.6. + +Version updating is done for NCPPlugin mainly, expect the other poms version to change randomly rather. + \ No newline at end of file diff --git a/NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheMC1_4_6.java b/NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheMC1_4_6.java new file mode 100644 index 00000000..248e7276 --- /dev/null +++ b/NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheMC1_4_6.java @@ -0,0 +1,113 @@ +package fr.neatmonster.nocheatplus.compat.cb2512; + +import java.util.Iterator; +import java.util.List; + +import net.minecraft.server.v1_4_6.AxisAlignedBB; +import net.minecraft.server.v1_4_6.IBlockAccess; +import net.minecraft.server.v1_4_6.Material; +import net.minecraft.server.v1_4_6.TileEntity; +import net.minecraft.server.v1_4_6.Vec3DPool; + +import org.bukkit.World; +import org.bukkit.craftbukkit.v1_4_6.CraftWorld; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftEntity; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; + +import fr.neatmonster.nocheatplus.utilities.BlockCache; + +public class BlockCacheMC1_4_6 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_4_6.World world; + + public BlockCacheMC1_4_6(World world) { + setAccess(world); + } + + @Override + public void setAccess(World world) { + this.world = world == null ? null : ((CraftWorld) world).getHandle(); + } + + @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){ + + // TODO: change api for this / use nodes (!) + final int id = getTypeId(x, y, z); + final net.minecraft.server.v1_4_6.Block block = net.minecraft.server.v1_4_6.Block.byId[id]; + if (block == null) return null; + block.updateShape(this, x, y, z); // TODO: use THIS instead of world. + + // minX, minY, minZ, maxX, maxY, maxZ + return new double[]{block.v(), block.x(), block.z(), block.w(), block.y(), block.A()}; + } + + @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: Probably check other ids too before doing this ? + + final net.minecraft.server.v1_4_6.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") + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + final net.minecraft.server.v1_4_6.Entity other = (net.minecraft.server.v1_4_6.Entity) iterator.next(); + final EntityType type = other.getBukkitEntity().getType(); + if (type != EntityType.BOAT && type != EntityType.MINECART) continue; + 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; + } + + @Override + public Material getMaterial(final int x, final int y, final int z) { + return world.getMaterial(x, y, z); + } + + @Override + public TileEntity getTileEntity(final int x, final int y, final int z) { + return world.getTileEntity(x, y, z); + } + + @Override + public Vec3DPool getVec3DPool() { + return world.getVec3DPool(); + } + + @Override + public boolean isBlockFacePowered(final int arg0, final int arg1, final int arg2, final int arg3) { + return world.isBlockFacePowered(arg0, arg1, arg2, arg3); + } + + @Override + public boolean t(final int x, final int y, final int z) { + return world.t(x, y, z); + } + +} diff --git a/NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessMC1_4_6.java b/NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessMC1_4_6.java new file mode 100644 index 00000000..06f092bc --- /dev/null +++ b/NCPCompatMC1_4_6/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessMC1_4_6.java @@ -0,0 +1,154 @@ +package fr.neatmonster.nocheatplus.compat.cb2512; + +import net.minecraft.server.v1_4_6.AxisAlignedBB; +import net.minecraft.server.v1_4_6.Block; +import net.minecraft.server.v1_4_6.DamageSource; +import net.minecraft.server.v1_4_6.EntityComplexPart; +import net.minecraft.server.v1_4_6.EntityPlayer; +import net.minecraft.server.v1_4_6.MobEffectList; + +import org.bukkit.Bukkit; +import org.bukkit.World; +import org.bukkit.command.CommandMap; +import org.bukkit.craftbukkit.v1_4_6.CraftServer; +import org.bukkit.craftbukkit.v1_4_6.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_4_6.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; + +public class MCAccessMC1_4_6 implements MCAccess{ + + /** + * Constructor to let it fail. + */ + public MCAccessMC1_4_6(){ + getCommandMap(); + } + + @Override + public String getMCVersion() { + return "1.4.6"; + } + + @Override + public String getServerVersionTag() { + return "MC1_4_6"; + } + + @Override + public CommandMap getCommandMap() { + return ((CraftServer) Bukkit.getServer()).getCommandMap(); + } + + @Override + public BlockCache getBlockCache(final World world) { + return new BlockCacheMC1_4_6(world); + } + + @Override + public double getHeight(final Entity entity) { + final net.minecraft.server.v1_4_6.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.byId[id]; + if (block == null || block.material == null) return AlmostBoolean.MAYBE; + else return AlmostBoolean.match(block.material.isSolid()); + } + + @Override + public AlmostBoolean isBlockLiquid(final int id) { + final Block block = Block.byId[id]; + if (block == null || block.material == null) return AlmostBoolean.MAYBE; + else return AlmostBoolean.match(block.material.isLiquid()); + } + + @Override + public boolean Block_i(final int id) { + try{ + return Block.i(id); + } + catch(Throwable t){ + // Minecraft default value. + return true; + } + } + + @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; + 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) return AlmostBoolean.YES; + } + return AlmostBoolean.MAYBE; + } + + @Override + public double getJumpAmplifier(final Player player) { + final net.minecraft.server.v1_4_6.EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle(); + + if (mcPlayer.hasEffect(MobEffectList.JUMP)) return mcPlayer.getEffect(MobEffectList.JUMP).getAmplifier(); + else return Double.MIN_VALUE; + } + + @Override + public double getFasterMovementAmplifier(final Player player) { + final net.minecraft.server.v1_4_6.EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle(); + if (mcPlayer.hasEffect(MobEffectList.FASTER_MOVEMENT)) return mcPlayer.getEffect(MobEffectList.FASTER_MOVEMENT).getAmplifier(); + else return Double.MIN_VALUE; + } + + @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 int damage) { + ((CraftPlayer) player).getHandle().damageEntity(DamageSource.FALL, damage); + } + + @Override + public boolean isComplexPart(final Entity entity) { + return ((CraftEntity) entity).getHandle() instanceof EntityComplexPart; + } + + @Override + public boolean shouldBeZombie(final Player player) { + final net.minecraft.server.v1_4_6.EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle(); + return !mcPlayer.dead && mcPlayer.getHealth() <= 0 ; + } + + @Override + public void setDead(final Player player, final int deathTicks) { + final net.minecraft.server.v1_4_6.EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle(); + mcPlayer.deathTicks = deathTicks; + mcPlayer.dead = true; + } + +} diff --git a/NCPPlugin/pom.xml b/NCPPlugin/pom.xml index 5b92e490..4e961af5 100644 --- a/NCPPlugin/pom.xml +++ b/NCPPlugin/pom.xml @@ -31,7 +31,7 @@ junit 4.8.2 - + fr.neatmonster ncpcommons 1.0.0 @@ -41,16 +41,21 @@ ncpcompat 1.0.0 - + fr.neatmonster ncpcompatcb2511 1.0.0 - + fr.neatmonster ncpcompatcb2512 1.0.0 + + fr.neatmonster + ncpcompatmc1_4_6 + 1.0.0 + diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java index 38c6e1bb..5e5bb296 100644 --- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java +++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccessFactory.java @@ -2,6 +2,7 @@ package fr.neatmonster.nocheatplus.compat; import fr.neatmonster.nocheatplus.compat.cb2511.MCAccessCB2511; import fr.neatmonster.nocheatplus.compat.cb2512.MCAccessCB2512; +import fr.neatmonster.nocheatplus.compat.cb2512.MCAccessMC1_4_6; /** * Factory class to hide potentially dirty stuff. @@ -24,7 +25,10 @@ public class MCAccessFactory { return new MCAccessCB2512(); } catch(Throwable t){}; - + try{ + return new MCAccessMC1_4_6(); + } + catch(Throwable t){}; throw new RuntimeException("Could not set up access to Minecraft API."); } } diff --git a/pom.xml b/pom.xml index a23012d9..2e6b1cca 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ NCPCompatCB2511 NCPCompatCB2512 NCPPlugin + NCPCompatMC1_4_6