H8-Network/VillagerOptimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I like this more

Browse Source
This commit is contained in:
xGinko 2023-09-08 18:21:32 +02:00
parent 829ee11d52
commit 17155dd297
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java
View File

@ -69,17 +69,16 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
double closestDistance = Double.MAX_VALUE; double closestDistance = Double.MAX_VALUE;
for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) { for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) {
if (entity.getType().equals(EntityType.VILLAGER)) { if (!entity.getType().equals(EntityType.VILLAGER)) continue;
Villager villager = (Villager) entity; Villager villager = (Villager) entity;
Villager.Profession profession = villager.getProfession(); Villager.Profession profession = villager.getProfession();
if (!profession.equals(Villager.Profession.NONE) && !profession.equals(Villager.Profession.NITWIT)) { if (profession.equals(Villager.Profession.NONE) || profession.equals(Villager.Profession.NITWIT)) continue;
WrappedVillager wVillager = villagerManager.getOrAdd(villager); WrappedVillager wVillager = villagerManager.getOrAdd(villager);
if (!wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) { if (!wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) {
closest = wVillager; closest = wVillager;
} }
} }
}
}
if (closest == null) return; if (closest == null) return;
@ -112,17 +111,16 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
double closestDistance = Double.MAX_VALUE; double closestDistance = Double.MAX_VALUE;
for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) { for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) {
if (entity.getType().equals(EntityType.VILLAGER)) { if (!entity.getType().equals(EntityType.VILLAGER)) continue;
Villager villager = (Villager) entity; Villager villager = (Villager) entity;
Villager.Profession profession = villager.getProfession(); Villager.Profession profession = villager.getProfession();
if (!profession.equals(Villager.Profession.NONE) && !profession.equals(Villager.Profession.NITWIT)) { if (profession.equals(Villager.Profession.NONE) || profession.equals(Villager.Profession.NITWIT)) continue;
WrappedVillager wVillager = villagerManager.getOrAdd(villager); WrappedVillager wVillager = villagerManager.getOrAdd(villager);
if (wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) { if (wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) {
closest = wVillager; closest = wVillager;
} }
} }
}
}
if (closest != null && closest.getOptimizationType().equals(OptimizationType.WORKSTATION)) { if (closest != null && closest.getOptimizationType().equals(OptimizationType.WORKSTATION)) {
if (shouldNotifyPlayer) { if (shouldNotifyPlayer) {