From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Fri, 31 Jul 2020 21:58:24 -0500 Subject: [PATCH] Option for simpler Villagers diff --git a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java index 0273d800eb75ba83edb36dff9e76f4d34031d600..9f04500e167b8403c7487044a4ae03a6be61062a 100644 --- a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java +++ b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java @@ -220,4 +220,13 @@ public class YatopiaConfig { private static void itemStuckSleepTicks() { itemStuckSleepTicks = getInt("settings.itemStuckSleepTicks", 1); } + public static boolean simplerVillagerBehavior = false; + private static void simplerVillagerBehavior() { + simplerVillagerBehavior = getBoolean("settings.villager.simplerVillagerBehavior", false); + } + + public static boolean villagersHideAtNight = false; + private static void villagersHideAtNight() { + villagersHideAtNight = getBoolean("settings.villager.villagersHideAtNight", false); + } } \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java index d906c5e530c2e7f779df079223aee619a73b5d51..2fb7f23275acad54d2f5e2ecd57d5bbb333facbe 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -7,6 +7,8 @@ import com.mojang.datafixers.util.Pair; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; import com.mojang.serialization.DynamicOps; + +import dev.tr7zw.yatopia.YatopiaConfig; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import java.util.*; @@ -27,6 +29,8 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent; public class EntityVillager extends EntityVillagerAbstract implements ReputationHandler, VillagerDataHolder { + //Yatopia + private boolean simplerVillagerBehavior = YatopiaConfig.simplerVillagerBehavior; //get this during villager creation so a reloaded config doesn't get them into an invalid state private static final DataWatcherObject by = DataWatcher.a(EntityVillager.class, DataWatcherRegistry.q); public static final Map bw = ImmutableMap.of(Items.BREAD, 4, Items.POTATO, 1, Items.CARROT, 1, Items.BEETROOT, 1); private static final Set bz = ImmutableSet.of(Items.BREAD, Items.POTATO, Items.CARROT, Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT, new Item[]{Items.BEETROOT_SEEDS}); @@ -63,12 +67,49 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation public EntityVillager(EntityTypes entitytypes, World world, VillagerType villagertype) { super(entitytypes, world); this.bF = new Reputation(); + if(!simplerVillagerBehavior) { ((Navigation) this.getNavigation()).a(true); this.getNavigation().d(true); + }else { + initPathfinder(); + } this.setCanPickupLoot(true); this.setVillagerData(this.getVillagerData().withType(villagertype).withProfession(VillagerProfession.NONE)); this.brainTickOffset = getRandom().nextInt(100); // Purpur } + //Yatopia start + + @Override + protected void initPathfinder() { + if(!simplerVillagerBehavior)return; + this.goalSelector.a(0, new PathfinderGoalFloat(this)); + if(YatopiaConfig.villagersHideAtNight) { + this.goalSelector.a(0, new PathfinderGoalUseItem<>(this, PotionUtil.a(new ItemStack(Items.POTION), Potions.INVISIBILITY), SoundEffects.ENTITY_WANDERING_TRADER_DISAPPEARED, (entityvillagertrader) -> { + return !this.world.isDay() && !entityvillagertrader.isInvisible(); + })); + this.goalSelector.a(0, new PathfinderGoalUseItem<>(this, new ItemStack(Items.MILK_BUCKET), SoundEffects.ENTITY_WANDERING_TRADER_REAPPEARED, (entityvillagertrader) -> { + return this.world.isDay() && entityvillagertrader.isInvisible(); + })); + } + this.goalSelector.a(1, new PathfinderGoalTradeWithPlayer(this)); + this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityZombie.class, 8.0F, 0.5D, 0.5D)); + this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityEvoker.class, 12.0F, 0.5D, 0.5D)); + this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityVindicator.class, 8.0F, 0.5D, 0.5D)); + this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityVex.class, 8.0F, 0.5D, 0.5D)); + this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityPillager.class, 15.0F, 0.5D, 0.5D)); + this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityIllagerIllusioner.class, 12.0F, 0.5D, 0.5D)); + this.goalSelector.a(1, new PathfinderGoalPanic(this, 0.5D)); + this.goalSelector.a(1, new PathfinderGoalLookAtTradingPlayer(this)); + this.goalSelector.a(2, new PathfinderGoalStrollVillageGolem(this, 0.6D)); + this.goalSelector.a(3, new PathfinderGoalMoveThroughVillage(this, 0.6D, false, 4, () -> { + return false; + })); + this.goalSelector.a(4, new PathfinderGoalMoveTowardsRestriction(this, 0.35D)); + this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D)); + this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F)); + this.goalSelector.a(10, new PathfinderGoalLookAtPlayer(this, EntityInsentient.class, 8.0F)); + } + //Yatopia end @Override public BehaviorController getBehaviorController() { @@ -82,6 +123,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @Override protected BehaviorController a(Dynamic dynamic) { + if(simplerVillagerBehavior)return super.a(dynamic); //Yatopia Don't use behaviorcontroller for simple Villagers BehaviorController behaviorcontroller = this.cJ().a(dynamic); this.a(behaviorcontroller); @@ -159,15 +201,47 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation super.inactiveTick(); } // Spigot End + // Yatopia start + private VillagerProfession getRandomProfession() { + int type = random.nextInt(13); + switch(type) { + case 0: return VillagerProfession.ARMORER; + case 1: return VillagerProfession.BUTCHER; + case 2: return VillagerProfession.CARTOGRAPHER; + case 3: return VillagerProfession.CLERIC; + case 4: return VillagerProfession.FARMER; + case 5: return VillagerProfession.FISHERMAN; + case 6: return VillagerProfession.FLETCHER; + case 7: return VillagerProfession.LEATHERWORKER; + case 8: return VillagerProfession.LIBRARIAN; + case 9: return VillagerProfession.MASON; + case 10: return VillagerProfession.SHEPHERD; + case 11: return VillagerProfession.TOOLSMITH; + case 12: return VillagerProfession.WEAPONSMITH; + default: return VillagerProfession.FARMER; + } + } + +// Yatopia end @Override protected void mobTick() { mobTick(false); } protected void mobTick(boolean inactive) { + // Yatopia start + if(simplerVillagerBehavior && this.getVillagerData().getProfession() == VillagerProfession.NONE) + this.setVillagerData(this.getVillagerData().withProfession(getRandomProfession())); + if(simplerVillagerBehavior) { + if (canRefresh()) { + restUses(); + } + } + // Yatopia end //this.world.getMethodProfiler().enter("villagerBrain"); // Akarin - remove caller // Purpur start boolean tick = (world.getTime() + brainTickOffset) % world.purpurConfig.villagerBrainTicks == 0; if (((WorldServer) world).getMinecraftServer().lagging ? tick : world.purpurConfig.villagerUseBrainTicksOnlyWhenLagging || tick) // Purpur end + if(!simplerVillagerBehavior) // Yatopia if (!inactive) this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper if (this.bM) { this.bM = false; @@ -298,6 +372,8 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation return true; } + public void restUses() {fb();} // Yatopia obf helper + public void fb() { this.fp(); Iterator iterator = this.getOffers().iterator(); @@ -332,6 +408,8 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation return this.bK == 0 || this.bK < 2 && this.world.getTime() > this.bJ + 2400L; } + public boolean canRefresh() {return fc();} // Yatopia obf helper + public boolean fc() { long i = this.bJ + 12000L; long j = this.world.getTime(); @@ -579,6 +657,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation } private void a(Entity entity) { + if(simplerVillagerBehavior)return; // Yatopia if (this.world instanceof WorldServer) { Optional> optional = this.bn.getMemory(MemoryModuleType.VISIBLE_MOBS); @@ -604,6 +683,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation } public void a(MemoryModuleType memorymoduletype) { + if(simplerVillagerBehavior)return; // Yatopia if (this.world instanceof WorldServer) { MinecraftServer minecraftserver = ((WorldServer) this.world).getMinecraftServer();