Fixed NPC pathing. Fixed Swimming. Fixed base skin texture

TheCyaniteProject · TheCyaniteProject · commit b27aeb238d25 · 2025-05-09T21:49:33.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -44,4 +44,5 @@ local.properties
 .cproject
 
 # PDT-specific
-.buildpath
+.buildpath
+*.png~
diff --git a/src/main/java/com/femboynuggy/helpfulnpcs/client/WorkerScreen.java b/src/main/java/com/femboynuggy/helpfulnpcs/client/WorkerScreen.java
@@ -6,11 +6,9 @@
 
 import com.femboynuggy.helpfulnpcs.HelpfulNPCs;
 import com.femboynuggy.helpfulnpcs.container.WorkerContainer;
-import com.femboynuggy.helpfulnpcs.entity.WorkerEntity;
 import com.femboynuggy.helpfulnpcs.network.SetWorkerCommandPacket;
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
diff --git a/src/main/java/com/femboynuggy/helpfulnpcs/entity/WorkerEntity.java b/src/main/java/com/femboynuggy/helpfulnpcs/entity/WorkerEntity.java
@@ -15,7 +15,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
@@ -29,27 +28,29 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.entity.PathfinderMob;
 import net.minecraft.world.entity.SpawnGroupData;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.ai.control.MoveControl;
+import net.minecraft.world.entity.ai.goal.FloatGoal;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
 import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
+import net.minecraft.world.entity.ai.goal.OpenDoorGoal;
 import net.minecraft.world.entity.ai.goal.PanicGoal;
 import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal;
 import net.minecraft.world.entity.ai.goal.RangedBowAttackGoal;
 import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
-import net.minecraft.world.entity.ai.goal.target.OwnerHurtTargetGoal;
 import net.minecraft.world.entity.ai.goal.target.TargetGoal;
 import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
+import net.minecraft.world.entity.ai.navigation.PathNavigation;
 import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import net.minecraft.world.entity.monster.RangedAttackMob;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.projectile.AbstractArrow;
-import net.minecraft.world.entity.projectile.Arrow;
 import net.minecraft.world.entity.projectile.ProjectileUtil;
 import net.minecraft.world.item.AxeItem;
 import net.minecraft.world.item.BowItem;
@@ -66,7 +67,6 @@
 import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.network.NetworkHooks;
 import net.minecraftforge.network.PlayMessages;
-import net.minecraft.world.entity.TamableAnimal;
 
 public class WorkerEntity extends PathfinderMob implements RangedAttackMob {
     // renamed from DATA_GHOST_ITEM → DATA_TARGET_ITEM
@@ -128,8 +128,8 @@ protected void onContentsChanged(int slot) {
     public WorkerEntity(EntityType<? extends WorkerEntity> type, Level world) {
         super(type, world);
         this.setPersistenceRequired();
-        this.moveControl = new MoveControl(this);
-        this.navigation  = new GroundPathNavigation(this, world);
+        //this.moveControl = new MoveControl(this);
+        //this.navigation  = new GroundPathNavigation(this, world);
     }
 
     public WorkerEntity(PlayMessages.SpawnEntity msg, Level world) {
@@ -141,6 +141,28 @@ public WorkerEntity(PlayMessages.SpawnEntity msg, Level world) {
     public WorkerEntity(FriendlyByteBuf buf, Level world) {
         this(ModEntities.WORKER.get(), world);
     }
+    
+    @Override
+    protected void registerGoals() {
+        super.registerGoals();
+
+        this.goalSelector.addGoal(0, new FloatGoal(this));
+        this.goalSelector.addGoal(0, new NaturalRegenGoal(this, 20*10, 20));
+        this.goalSelector.addGoal(0, new OpenDoorGoal(this, true));
+
+        this.targetSelector.addGoal(1, new HurtByTargetGoal(this).setAlertOthers());
+        this.targetSelector.addGoal(1, new DefendMasterHurtByTargetGoal(this));
+        this.goalSelector.addGoal(1, new WorkerBowAttackGoal(this, 1.2D, 20, 15.0F));
+
+        this.goalSelector.addGoal(2, new MeleeAttackGoal(this, 1.5D, true));
+        this.targetSelector.addGoal(2, new DefendMasterHurtTargetGoal(this));
+
+        this.goalSelector.addGoal(3, new PanicGoal(this, 1.25));
+        this.goalSelector.addGoal(4, new FollowMasterGoal(this, 1.5D, 5.0F));
+        this.goalSelector.addGoal(4, new CommandMoveToGoal(this, 1.0D));
+        this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 8.0F, 1.0F));
+        this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 6.0F));
+    }
 
     @Override
     public Packet<ClientGamePacketListener> getAddEntityPacket() {
@@ -149,9 +171,8 @@ public Packet<ClientGamePacketListener> getAddEntityPacket() {
 
     private boolean interacting = false;
 
-    // called when you open the GUI in your onInteract or NetworkHooks.openGui callback:
     public void setInteracting(boolean b) {
-        System.out.println("CLIENT: "+b);
+        //System.out.println("CLIENT: "+b);
         this.interacting = b;
     }
     public boolean isInteracting() {
@@ -201,37 +222,24 @@ public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstanc
         return super.finalizeSpawn(world, difficulty, reason, data, tag);
     }
 
+    @Override
+    protected PathNavigation createNavigation(Level world) {
+        GroundPathNavigation nav = new GroundPathNavigation(this, world);
+        // allow opening wooden doors
+        nav.setCanOpenDoors(true);
+        // allow walking **through** an open door block
+        nav.setCanPassDoors(true);
+        // if you want them to swim, too:
+        nav.setCanFloat(true);
+        return nav;
+    }
+
     // getters for the four indices:
     public int  getBodyIndex()   { return this.entityData.get(DATA_BODY);   }
     public int  getOutfitIndex() { return this.entityData.get(DATA_OUTFIT); }
     public int  getEyesIndex()   { return this.entityData.get(DATA_EYES);   }
     public int  getHairIndex()   { return this.entityData.get(DATA_HAIR);   }
 
-    @Override
-    protected void registerGoals() {
-        super.registerGoals();
-
-        this.goalSelector.addGoal(0, new NaturalRegenGoal(this, 20*10, 20));
-        // MELEE first:
-        this.goalSelector.addGoal(2, new MeleeAttackGoal(this, 1.5D, true));
-        // then follow master if we have a weapon:
-        this.goalSelector.addGoal(3, new FollowMasterGoal(this, 1.5D, 5.0F));
-        // then bow (if bow in hand):
-        this.goalSelector.addGoal(1, new WorkerBowAttackGoal(this, 1.2D, 20, 15.0F));
-        // normal idle/look goals:
-        this.goalSelector.addGoal(4, new PanicGoal(this, 1.25));
-        //this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0)); // TODO Might re-implement this later, but for now it's just annoying
-        this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
-        this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 8.0F));
-        // your move‐to‐listData goal:
-        this.goalSelector.addGoal(9, new CommandMoveToGoal(this, 1.0D));
-
-        // DEFENSIVE target goals:
-        this.targetSelector.addGoal(1, new HurtByTargetGoal(this).setAlertOthers());
-        this.targetSelector.addGoal(1, new DefendMasterHurtByTargetGoal(this));
-        this.targetSelector.addGoal(2, new DefendMasterHurtTargetGoal(this));
-    }
-
     public static AttributeSupplier.Builder createAttributes() {
         return PathfinderMob.createMobAttributes()
             .add(Attributes.MAX_HEALTH,       20.0D)
diff --git a/src/main/java/com/femboynuggy/helpfulnpcs/entity/goal/CommandMoveToGoal.java b/src/main/java/com/femboynuggy/helpfulnpcs/entity/goal/CommandMoveToGoal.java
@@ -6,71 +6,71 @@
 
 import com.femboynuggy.helpfulnpcs.entity.WorkerEntity;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.pathfinder.Path;
 import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 
 public class CommandMoveToGoal extends Goal {
     private final WorkerEntity mob;
     private final double speed;
+    private Path path;  
+    private int recalcCooldown = 0;
+    private double stoppingDistance = 3.0;
 
-    private enum Stage { GO_TO_TARGET, WAIT_AFTER_OP }
+    enum Stage { GO_TO_TARGET, WAIT_AFTER_OP }
     private Stage stage = Stage.GO_TO_TARGET;
-
     private final List<TargetEntry> entries = new ArrayList<>();
     private int currentIndex = 0;
     private int waitTicks    = 0;
-
-    // ← NEW: remember what size we loaded at start()
     private int lastListSize = 0;
 
     public CommandMoveToGoal(WorkerEntity mob, double speed) {
         this.mob   = mob;
         this.speed = speed;
         this.setFlags(EnumSet.of(Flag.MOVE));
+        if (!(mob.getNavigation() instanceof GroundPathNavigation))
+            throw new IllegalArgumentException("Must have GroundPathNavigation");
     }
 
     @Override
     public boolean canUse() {
-        // only run this goal if the worker is holding a book & quill
         if (mob.getMainHandItem().getItem() != Items.WRITABLE_BOOK) return false;
         if (mob.isInteracting()) return false;
-        boolean ok = parseEntries();
-        if (ok) lastListSize = entries.size();
-        return ok;
+        if (!parseEntries()) return false;
+        lastListSize = entries.size();
+        currentIndex = 0;
+        stage = Stage.GO_TO_TARGET;
+        waitTicks = 0;
+        // force an immediate path calculation
+        recalcCooldown = 0;
+        computePathToCurrent();
+        return path != null;
     }
 
     @Override
     public boolean canContinueToUse() {
-        // drop out immediately if they let go of the book & quill
         if (mob.getMainHandItem().getItem() != Items.WRITABLE_BOOK) return false;
         if (mob.isInteracting()) return false;
-        // also re-parse and check for listData changes
-        boolean ok = parseEntries();
-        if (!ok || entries.size() != lastListSize) {
-            return false;
-        }
+        if (!parseEntries() || entries.size() != lastListSize) return false;
         return true;
     }
 
     @Override
     public void start() {
-        currentIndex = 0;
-        waitTicks    = 0;
-        stage        = Stage.GO_TO_TARGET;
-        navigateToCurrent();
+        // nothing more to do; we've already computed path in canUse()
     }
 
     @Override
@@ -81,55 +81,62 @@ public void stop() {
 
     @Override
     public void tick() {
-        if (mob.isInteracting()) {
-            mob.getNavigation().stop();
-            return;
-        }
         if (entries.isEmpty()) return;
         TargetEntry te = entries.get(currentIndex);
 
-        double dist2 = mob.position()
-                        .distanceToSqr(te.pos.getX() + 0.5,
-                                    te.pos.getY() + 0.5,
-                                    te.pos.getZ() + 0.5);
-        switch(stage) {
-            case GO_TO_TARGET:
-                if (dist2 <= 5.0) {
-                    mob.getNavigation().stop();
-
-                    if (!mob.level().isClientSide) {
-                        mob.swing(InteractionHand.MAIN_HAND, true); // This isn't working for some reason
-                        //System.out.println(">> SERVER: swung arm and broadcasted entity event");
-                    }
-                    
-                    if ("extract".equalsIgnoreCase(te.mode)) {
-                        extractFromContainer(te);
-                    } else {
-                        insertToContainer(te);
-                    }
-
-                    stage     = Stage.WAIT_AFTER_OP;
-                    waitTicks = 0;
-                }
-                break;
+        // look at the block
+        mob.getLookControl().setLookAt(
+            te.pos.getX()+0.5, te.pos.getY()+0.5, te.pos.getZ()+0.5,
+            30, 30
+        );
+
+        // if we've lost our path or it’s done, or we’ve been on it too long, recompute
+        if (mob.getNavigation().isDone() 
+            || mob.getNavigation().isStuck() 
+            || --recalcCooldown <= 0) {
+            computePathToCurrent();
+        }
 
-            case WAIT_AFTER_OP:
-                if (++waitTicks >= 20) {
-                    currentIndex = (currentIndex + 1) % entries.size();
-                    navigateToCurrent();
-                    stage = Stage.GO_TO_TARGET;
-                }
-                break;
+        // now the nav will automatically follow 'path' around obstacles
+        // check arrival
+        double dist2 = mob.position().distanceToSqr(
+            te.pos.getX()+0.5, te.pos.getY()+0.5, te.pos.getZ()+0.5
+        );
+
+        if (stage == Stage.GO_TO_TARGET && dist2 <= stoppingDistance) {
+            mob.getNavigation().stop();
+
+            mob.swing(InteractionHand.MAIN_HAND);
+
+            if ("extract".equalsIgnoreCase(te.mode)) {
+                extractFromContainer(te);
+            } else {
+                insertToContainer(te);
+            }
+
+            stage = Stage.WAIT_AFTER_OP;
+            waitTicks = 0;
+            return;
+        }
+
+        if (stage == Stage.WAIT_AFTER_OP && ++waitTicks >= 20) {
+            currentIndex = (currentIndex + 1) % entries.size();
+            stage = Stage.GO_TO_TARGET;
+            // force a fresh path for the new target
+            computePathToCurrent();
+            waitTicks = 0;
         }
     }
 
-    private void navigateToCurrent() {
+    /** Builds a fresh A* path to entries.get(currentIndex) and starts following it. */
+    private void computePathToCurrent() {
         TargetEntry te = entries.get(currentIndex);
-        mob.getNavigation()
-           .moveTo(te.pos.getX() + 0.5,
-                   te.pos.getY() + 0.5,
-                   te.pos.getZ() + 0.5,
-                   speed);
+        // use a small “fudge” parameter so we can step up blocks if needed
+        this.path = mob.getNavigation().createPath(te.pos, 0);
+        if (path != null) {
+            mob.getNavigation().moveTo(path, speed);
+            recalcCooldown = 40 + mob.getRandom().nextInt(40);
+        }
     }
 
     private boolean parseEntries() {
diff --git a/src/main/resources/assets/helpfulnpcs/lang/en_us.json b/src/main/resources/assets/helpfulnpcs/lang/en_us.json
@@ -1,3 +1,4 @@
 {
-    "item.helpfulnpcs.contract": "NPC Contract"
+    "item.helpfulnpcs.contract": "NPC Contract",
+    "entity.helpfulnpcs.worker": "NPC Worker"
 }
diff --git a/src/main/resources/assets/helpfulnpcs/textures/entity/body1.png b/src/main/resources/assets/helpfulnpcs/textures/entity/body1.png

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- "item.helpfulnpcs.contract": "NPC Contract"`
	`2`	`+ "item.helpfulnpcs.contract": "NPC Contract",`
	`3`	`+ "entity.helpfulnpcs.worker": "NPC Worker"`
`3`	`4`	`}`