icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added jump method to MobAi.java

Browse Source 
My justification: https://github.com/gnembon/fabric-carpet/pull/241#discussion_r415576459
This commit is contained in:
Nameless-123 committed 2020-04-27 09:30:31 +02:00
1 parent e1c8712656
commit a19e759039
2 files changed
+27 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/value/EntityValue.java
+2 -18
View File
@@ -62,6 +62,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static carpet.script.value.NBTSerializableValue.nameFromRegistryId; import static carpet.script.value.NBTSerializableValue.nameFromRegistryId;
import static carpet.utils.MobAI.jump;
// TODO: decide whether copy(entity) should duplicate entity in the world. // TODO: decide whether copy(entity) should duplicate entity in the world.
public class EntityValue extends Value public class EntityValue extends Value
@@ -912,24 +913,7 @@ public class EntityValue extends Value
}); });
put("jump",(e,v)->{//Most *REDACTED* up code in the world put("jump",(e,v)->{//Most *REDACTED* up code in the world
jump((LivingEntity)e);
float m = e.world.getBlockState(new BlockPos(e)).getBlock().getJumpVelocityMultiplier();
float g = e.world.getBlockState(new BlockPos(e.getX(), e.getBoundingBox().y1 - 0.5000001D, e.getZ())).getBlock().getJumpVelocityMultiplier();
float JumpVelocityMultiplier= (double)m == 1.0D ? g : m;
float f = (0.42F * JumpVelocityMultiplier);
if (((LivingEntity)e).hasStatusEffect(StatusEffects.JUMP_BOOST)) {
f += 0.1F * (float)(((LivingEntity)e).getStatusEffect(StatusEffects.JUMP_BOOST).getAmplifier() + 1);
}
Vec3d vec3d = e.getVelocity();
e.setVelocity(vec3d.x, f, vec3d.z);
if (e.isSprinting()) {
float u = e.yaw * 0.017453292F;
e.setVelocity(e.getVelocity().add((-MathHelper.sin(g) * 0.2F), 0.0D, (MathHelper.cos(u) * 0.2F)));
}
e.velocityDirty = true;
}); });
// gamemode [check] // gamemode [check]
src/main/java/carpet/utils/MobAI.java
+25
View File
@@ -4,7 +4,12 @@ import carpet.CarpetServer;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import java.util.HashMap; import java.util.HashMap;
@@ -93,4 +98,24 @@ public class MobAI
} }
} }
public static void jump(LivingEntity e){
float m = e.world.getBlockState(new BlockPos(e)).getBlock().getJumpVelocityMultiplier();
float g = e.world.getBlockState(new BlockPos(e.getX(), e.getBoundingBox().y1 - 0.5000001D, e.getZ())).getBlock().getJumpVelocityMultiplier();
float JumpVelocityMultiplier= (double)m == 1.0D ? g : m;
float f = (0.42F * JumpVelocityMultiplier);
if (e.hasStatusEffect(StatusEffects.JUMP_BOOST)) {
f += 0.1F * (float)(e.getStatusEffect(StatusEffects.JUMP_BOOST).getAmplifier() + 1);
}
Vec3d vec3d = e.getVelocity();
e.setVelocity(vec3d.x, f, vec3d.z);
if (e.isSprinting()) {
float u = e.yaw * 0.017453292F;
e.setVelocity(e.getVelocity().add((-MathHelper.sin(g) * 0.2F), 0.0D, (MathHelper.cos(u) * 0.2F)));
}
e.velocityDirty = true;
}
} }