Skip to content

Commit

Permalink
Optimize moth pathing, add tag for targeted held items (Fixes #35), a…
Browse files Browse the repository at this point in the history 
…dd curse relations to buildscript
  • Loading branch information
@itsmeow
itsmeow committed Apr 23, 2022
1 parent 35c2372 commit 228bb8e
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 11 deletions.
62 changes: 51 additions & 11 deletions common/src/main/java/dev/itsmeow/whisperwoods/entity/EntityMoth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import dev.itsmeow.imdlib.entity.util.EntityTypeContainerContainable;
import dev.itsmeow.imdlib.item.ItemModEntityContainer;
import dev.itsmeow.whisperwoods.init.ModEntities;
import dev.itsmeow.whisperwoods.init.ModTags;
import dev.itsmeow.whisperwoods.util.ModPlatformEvents;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
Expand All @@ -23,17 +24,18 @@
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LightLayer;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SupportType;
import net.minecraft.world.level.block.TorchBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;

import java.util.List;
import java.util.function.Predicate;

public class EntityMoth extends EntityAnimalWithTypesAndSizeContainable {

Expand Down Expand Up @@ -118,8 +120,9 @@ protected void customServerAiStep() {
super.customServerAiStep();
BlockPos blockpos = this.blockPosition();
if(this.isLanded()) {
BlockPos offset = blockpos.relative(Direction.from3DDataValue(this.getLandedInteger()));
if(this.level.getBlockState(offset).isRedstoneConductor(this.level, offset)) {
Direction d = Direction.from3DDataValue(this.getLandedInteger());
BlockPos offset = blockpos.relative(d);
if(this.level.getBlockState(offset).isFaceSturdy(this.level, offset, d.getOpposite(), SupportType.CENTER)) {
if(this.level.getNearestPlayer(playerPredicate, this) != null || this.getRandom().nextInt(this.isAttractedToLight() ? 500 : 1000) == 0) {
this.setNotLanded();
}
Expand Down Expand Up @@ -156,22 +159,27 @@ protected void customServerAiStep() {
for(LivingEntity entity : level.getEntitiesOfClass(LivingEntity.class, this.getBoundingBox().inflate(10))) {
for(InteractionHand hand : InteractionHand.values()) {
Item held = entity.getItemInHand(hand).getItem();
if(held == Items.TORCH || held == Items.LANTERN) {
if(held.is(ModTags.Items.MOTH_TARGET_HELD_LIGHT_ITEMS)) {
this.targetPosition = entity.blockPosition().offset(0, 1.5, 0);
found = true;
this.setNotLanded();
break;
}
}
if(found) {
break;
}
}
}
if(!found && this.level.getNearestPlayer(playerPredicate, this) == null && this.getRandom().nextInt(this.isAttractedToLight() ? 80 : 30) == 0) {
for(Direction direction : Direction.values()) {
if(direction != Direction.UP) {
BlockPos offset = blockpos.relative(direction);
if(level.getBlockState(offset).isRedstoneConductor(level, offset)) {
if(level.getBlockState(offset).isFaceSturdy(level, offset, direction.getOpposite(), SupportType.CENTER)) {
this.setLanded(direction);
this.targetPosition = null;
found = true;
break;
}
}
}
Expand All @@ -182,17 +190,26 @@ protected void customServerAiStep() {
}
}
if(!this.isLanded() && targetPosition != null) {
if(this.isInWall()) {
this.targetPosition = this.tryToFindPositionSlow(pos -> {
AABB abb = this.getBoundingBox();
Vec3 diff = new Vec3(pos.getX() + 0.5D, pos.getY() + 0.1D, pos.getZ() + 0.5D).subtract(this.position());
double length = diff.length();
diff = diff.normalize();
for(int i = 1; i < length; ++i) {
abb = abb.move(diff);
if (!this.level.noCollision(this, abb)) {
return false;
}
}
return true;
});
}
double d0 = (double) this.targetPosition.getX() + 0.5D - this.getX();
double d1 = (double) this.targetPosition.getY() + 0.1D - this.getY();
double d2 = (double) this.targetPosition.getZ() + 0.5D - this.getZ();
Vec3 vec3d = this.getDeltaMovement();
Vec3 vec3d1 = vec3d.add((Math.signum(d0) * 0.5D - vec3d.x) * (double) 0.1F, (Math.signum(d1) * (double) 0.7F - vec3d.y) * (double) 0.1F, (Math.signum(d2) * 0.5D - vec3d.z) * (double) 0.1F);
float width = this.getContainer().getEntityType().getDimensions().width * 0.8F;
AABB axisalignedbb = AABB.ofSize(width, 0.1F, width).move(this.getX() + vec3d1.x(), this.getEyeY() + vec3d1.y(), this.getZ() + vec3d1.z());
boolean collides = this.level.getBlockCollisions(this, axisalignedbb, (state, pos2) -> state.isSuffocating(this.level, pos2)).findAny().isPresent();
if(collides) {
vec3d1 = vec3d1.multiply(0.5, 0.5, 0.5);
}
this.setDeltaMovement(vec3d1);
float f = (float) (Mth.atan2(vec3d1.z, vec3d1.x) * (double) (180F / (float) Math.PI)) - 90.0F;
float f1 = Mth.wrapDegrees(f - this.yRot);
Expand All @@ -207,6 +224,29 @@ protected void customServerAiStep() {
}
}

private BlockPos tryToFindPositionSlow(Predicate<BlockPos> condition) {
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
int i = 12;
int j = 2;
boolean down = false;
while (!down) {
for (int k = down ? -1 : 0; down ? k >= -j : k <= j; k += down ? -1 : 1) {
for (int l = 0; l < i; ++l) {
for (int i1 = 0; i1 <= l; i1 = i1 > 0 ? -i1 : 1 - i1) {
for (int j1 = i1 < l && i1 > -l ? l : 0; j1 <= l; j1 = j1 > 0 ? -j1 : 1 - j1) {
pos.set(this.blockPosition()).move(i1, k, j1);
if (condition.test(pos.immutable())) {
return pos.immutable();
}
}
}
}
}
down = true;
}
return null;
}

public boolean isAttractedToLight() {
long time = this.level.getDayTime() % 24000L;
return level.getBrightness(LightLayer.SKY, this.blockPosition()) < 10 || (time >= 13000L && time <= 23000L);
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/dev/itsmeow/whisperwoods/init/ModTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ private static Tag.Named<Block> tag(String name) {
public static final class Items {
public static final Tag.Named<Item> GHOST_LIGHT = tag("ghost_light");
public static final Tag.Named<Item> WISP_LANTERN = tag("wisp_lantern");
public static final Tag.Named<Item> MOTH_TARGET_HELD_LIGHT_ITEMS = tag("moth_target_held_light_items");

public static void loadTags() {
// This is a classloading dummy.
Expand Down
10 changes: 10 additions & 0 deletions common/src/main/resources/data/whisperwoods/tags/items/moth_target_held_light_items.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"replace": false,
"values": [
"minecraft:torch",
"minecraft:lantern",
"minecraft:soul_lantern",
"#whisperwoods:ghost_light",
"#whisperwoods:wisp_lantern"
]
}
2 changes: 2 additions & 0 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
curse_project_id = 349597
curse_versions_fabric = Minecraft 1.16:1.16.5,Java 8,Fabric
curse_versions_forge = Minecraft 1.16:1.16.5,Java 8,Forge
curse_relations_fabric = fabric-api:requiredDependency,architectury-fabric:requiredDependency,cloth-config:optionalDependency,modmenu:optionalDependency,fiber2cloth:embeddedLibrary
curse_relations_forge = architectury-forge:requiredDependency

# Toolchain Versions
loom_version = 0.11.0-SNAPSHOT
Expand Down

0 comments on commit 228bb8e

Please sign in to comment.