Skip to content

Commit

Permalink
New Features and shit 1.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
funkemunky committed Jan 18, 2019
1 parent df7cf46 commit 8b2e28d
Show file tree
Hide file tree
Showing 152 changed files with 302 additions and 169 deletions.
408 changes: 243 additions & 165 deletions API/.idea/workspace.xml

Large diffs are not rendered by default.

Binary file modified API/out/artifacts/Atlas_jar/Atlas.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions API/src/cc/funkemunky/api/utils/blockbox/BlockBox.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ public interface BlockBox {

boolean isRiptiding(LivingEntity entity);

float getMovementFactor(Player player);

int getTrackerId(Player player);
}
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ public boolean isUsingItem(Player player) {
return entity.cA() != null && entity.cA().getItem().f(entity.cA()) != net.minecraft.server.v1_10_R1.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public boolean isRiptiding(LivingEntity entity) {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ public boolean isUsingItem(Player player) {
return entity.cB() != null && entity.cB().getItem().f(entity.cB()) != EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public boolean isRiptiding(LivingEntity entity) {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ public boolean isUsingItem(Player player) {
return entity.cJ() != null && entity.cJ().getItem().f(entity.cJ()) != net.minecraft.server.v1_12_R1.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public boolean isRiptiding(LivingEntity entity) {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ public boolean isUsingItem(Player player) {
return entity.cW() != null && entity.cW().l() != net.minecraft.server.v1_13_R1.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public int getTrackerId(Player player) {
EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ public boolean isUsingItem(Player player) {
return entity.cW() != null && entity.cW().l() != net.minecraft.server.v1_13_R2.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public int getTrackerId(Player player) {
EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
import cc.funkemunky.api.utils.ReflectionsUtil;
import cc.funkemunky.api.utils.blockbox.BlockBox;
import com.google.common.collect.Lists;
import net.minecraft.server.v1_7_R4.AxisAlignedBB;
import net.minecraft.server.v1_7_R4.EntityPlayer;
import net.minecraft.server.v1_7_R4.EntityTrackerEntry;
import net.minecraft.server.v1_7_R4.WorldServer;
import net.minecraft.server.v1_7_R4.*;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
Expand Down Expand Up @@ -129,6 +126,11 @@ public boolean isUsingItem(Player player) {
return entity.bF() != null && entity.bF().getItem().d(entity.bF()) != net.minecraft.server.v1_7_R4.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.d).getValue();
}

@Override
public int getTrackerId(Player player) {
EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ public boolean isUsingItem(Player player) {
net.minecraft.server.v1_8_R1.EntityHuman entity = ((org.bukkit.craftbukkit.v1_8_R1.entity.CraftHumanEntity) player).getHandle();
return entity.bY() != null && entity.bY().getItem().e(entity.bY()) != net.minecraft.server.v1_8_R1.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.d).getValue();
}

@Override
public int getTrackerId(Player player) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ public boolean isUsingItem(Player player) {
return entity.bZ() != null && entity.bZ().getItem().e(entity.bZ()) != net.minecraft.server.v1_8_R2.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.d).getValue();
}

@Override
public int getTrackerId(Player player) {
EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -133,6 +134,11 @@ public boolean isRiptiding(LivingEntity entity) {
return false;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public int getTrackerId(Player player) {
EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ public boolean isUsingItem(Player player) {
return entity.cv() != null && entity.cv().getItem().f(entity.cv()) != net.minecraft.server.v1_9_R1.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public int getTrackerId(Player player) {
EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ public boolean isUsingItem(Player player) {
net.minecraft.server.v1_9_R2.EntityLiving entity = ((org.bukkit.craftbukkit.v1_9_R2.entity.CraftLivingEntity) player).getHandle();
return entity.cw() != null && entity.cw().getItem().f(entity.cw()) != net.minecraft.server.v1_9_R2.EnumAnimation.NONE;
}

@Override
public float getMovementFactor(Player player) {
return (float) ((CraftPlayer) player).getHandle().getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
}

@Override
public boolean isRiptiding(LivingEntity entity) {
Expand Down

0 comments on commit 8b2e28d

Please sign in to comment.