diff options
Diffstat (limited to 'patch-remap/mache-vineflower/net/minecraft/world/entity/monster/Illusioner.java.patch')
| -rw-r--r-- | patch-remap/mache-vineflower/net/minecraft/world/entity/monster/Illusioner.java.patch | 324 |
1 files changed, 324 insertions, 0 deletions
diff --git a/patch-remap/mache-vineflower/net/minecraft/world/entity/monster/Illusioner.java.patch b/patch-remap/mache-vineflower/net/minecraft/world/entity/monster/Illusioner.java.patch new file mode 100644 index 0000000000..2c34f0888c --- /dev/null +++ b/patch-remap/mache-vineflower/net/minecraft/world/entity/monster/Illusioner.java.patch @@ -0,0 +1,324 @@ +--- a/net/minecraft/world/entity/monster/Illusioner.java ++++ b/net/minecraft/world/entity/monster/Illusioner.java +@@ -12,12 +12,12 @@ + import net.minecraft.world.effect.MobEffects; + import net.minecraft.world.entity.Entity; + import net.minecraft.world.entity.EntityType; ++import net.minecraft.world.entity.EnumMobSpawn; ++import net.minecraft.world.entity.EnumMonsterType; + import net.minecraft.world.entity.EquipmentSlot; ++import net.minecraft.world.entity.GroupDataEntity; + import net.minecraft.world.entity.LivingEntity; + import net.minecraft.world.entity.Mob; +-import net.minecraft.world.entity.MobSpawnType; +-import net.minecraft.world.entity.MobType; +-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.goal.FloatGoal; +@@ -40,6 +40,7 @@ + import net.minecraft.world.phys.Vec3; + + public class Illusioner extends SpellcasterIllager implements RangedAttackMob { ++ + private static final int NUM_ILLUSIONS = 4; + private static final int ILLUSION_TRANSITION_TICKS = 3; + private static final int ILLUSION_SPREAD = 3; +@@ -51,10 +52,11 @@ + this.xpReward = 5; + this.clientSideIllusionOffsets = new Vec3[2][4]; + +- for (int i = 0; i < 4; i++) { ++ for (int i = 0; i < 4; ++i) { + this.clientSideIllusionOffsets[0][i] = Vec3.ZERO; + this.clientSideIllusionOffsets[1][i] = Vec3.ZERO; + } ++ + } + + @Override +@@ -64,24 +66,22 @@ + this.goalSelector.addGoal(1, new SpellcasterIllager.SpellcasterCastingSpellGoal()); + this.goalSelector.addGoal(4, new Illusioner.IllusionerMirrorSpellGoal()); + this.goalSelector.addGoal(5, new Illusioner.IllusionerBlindnessSpellGoal()); +- this.goalSelector.addGoal(6, new RangedBowAttackGoal<>(this, 0.5, 20, 15.0F)); +- this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6)); ++ this.goalSelector.addGoal(6, new RangedBowAttackGoal<>(this, 0.5D, 20, 15.0F)); ++ this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D)); + this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F)); + this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 8.0F)); +- this.targetSelector.addGoal(1, new HurtByTargetGoal(this, Raider.class).setAlertOthers()); +- this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true).setUnseenMemoryTicks(300)); +- this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false).setUnseenMemoryTicks(300)); +- this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, false).setUnseenMemoryTicks(300)); ++ this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Raider.class})).setAlertOthers()); ++ this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300)); ++ this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300)); ++ this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, IronGolem.class, false)).setUnseenMemoryTicks(300)); + } + + public static AttributeSupplier.Builder createAttributes() { +- return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.FOLLOW_RANGE, 18.0).add(Attributes.MAX_HEALTH, 32.0); ++ return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.5D).add(Attributes.FOLLOW_RANGE, 18.0D).add(Attributes.MAX_HEALTH, 32.0D); + } + + @Override +- public SpawnGroupData finalizeSpawn( +- ServerLevelAccessor level, DifficultyInstance difficulty, MobSpawnType reason, @Nullable SpawnGroupData spawnData, @Nullable CompoundTag dataTag +- ) { ++ public GroupDataEntity finalizeSpawn(ServerLevelAccessor level, DifficultyInstance difficulty, EnumMobSpawn reason, @Nullable GroupDataEntity spawnData, @Nullable CompoundTag dataTag) { + this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(Items.BOW)); + return super.finalizeSpawn(level, difficulty, reason, spawnData, dataTag); + } +@@ -93,47 +93,47 @@ + + @Override + public AABB getBoundingBoxForCulling() { +- return this.getBoundingBox().inflate(3.0, 0.0, 3.0); ++ return this.getBoundingBox().inflate(3.0D, 0.0D, 3.0D); + } + + @Override + public void aiStep() { + super.aiStep(); + if (this.level().isClientSide && this.isInvisible()) { +- this.clientSideIllusionTicks--; ++ --this.clientSideIllusionTicks; + if (this.clientSideIllusionTicks < 0) { + this.clientSideIllusionTicks = 0; + } + +- if (this.hurtTime == 1 || this.tickCount % 1200 == 0) { ++ if (this.hurtTime != 1 && this.tickCount % 1200 != 0) { ++ if (this.hurtTime == this.hurtDuration - 1) { ++ this.clientSideIllusionTicks = 3; ++ ++ for (int i = 0; i < 4; ++i) { ++ this.clientSideIllusionOffsets[0][i] = this.clientSideIllusionOffsets[1][i]; ++ this.clientSideIllusionOffsets[1][i] = new Vec3(0.0D, 0.0D, 0.0D); ++ } ++ } ++ } else { + this.clientSideIllusionTicks = 3; + float f = -6.0F; +- int i = 13; ++ boolean flag = true; + +- for (int i1 = 0; i1 < 4; i1++) { +- this.clientSideIllusionOffsets[0][i1] = this.clientSideIllusionOffsets[1][i1]; +- this.clientSideIllusionOffsets[1][i1] = new Vec3( +- (double)(-6.0F + (float)this.random.nextInt(13)) * 0.5, +- (double)Math.max(0, this.random.nextInt(6) - 4), +- (double)(-6.0F + (float)this.random.nextInt(13)) * 0.5 +- ); +- } ++ int j; + +- for (int i1 = 0; i1 < 16; i1++) { +- this.level().addParticle(ParticleTypes.CLOUD, this.getRandomX(0.5), this.getRandomY(), this.getZ(0.5), 0.0, 0.0, 0.0); ++ for (j = 0; j < 4; ++j) { ++ this.clientSideIllusionOffsets[0][j] = this.clientSideIllusionOffsets[1][j]; ++ this.clientSideIllusionOffsets[1][j] = new Vec3((double) (-6.0F + (float) this.random.nextInt(13)) * 0.5D, (double) Math.max(0, this.random.nextInt(6) - 4), (double) (-6.0F + (float) this.random.nextInt(13)) * 0.5D); + } + +- this.level() +- .playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.ILLUSIONER_MIRROR_MOVE, this.getSoundSource(), 1.0F, 1.0F, false); +- } else if (this.hurtTime == this.hurtDuration - 1) { +- this.clientSideIllusionTicks = 3; +- +- for (int i2 = 0; i2 < 4; i2++) { +- this.clientSideIllusionOffsets[0][i2] = this.clientSideIllusionOffsets[1][i2]; +- this.clientSideIllusionOffsets[1][i2] = new Vec3(0.0, 0.0, 0.0); ++ for (j = 0; j < 16; ++j) { ++ this.level().addParticle(ParticleTypes.CLOUD, this.getRandomX(0.5D), this.getRandomY(), this.getZ(0.5D), 0.0D, 0.0D, 0.0D); + } ++ ++ this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.ILLUSIONER_MIRROR_MOVE, this.getSoundSource(), 1.0F, 1.0F, false); + } + } ++ + } + + @Override +@@ -145,22 +145,22 @@ + if (this.clientSideIllusionTicks <= 0) { + return this.clientSideIllusionOffsets[1]; + } else { +- double d = (double)(((float)this.clientSideIllusionTicks - partialTick) / 3.0F); +- double var6 = Math.pow(d, 0.25); +- Vec3[] vec3s = new Vec3[4]; ++ double d0 = (double) (((float) this.clientSideIllusionTicks - partialTick) / 3.0F); + +- for (int i = 0; i < 4; i++) { +- vec3s[i] = this.clientSideIllusionOffsets[1][i].scale(1.0 - var6).add(this.clientSideIllusionOffsets[0][i].scale(var6)); ++ d0 = Math.pow(d0, 0.25D); ++ Vec3[] avec3d = new Vec3[4]; ++ ++ for (int i = 0; i < 4; ++i) { ++ avec3d[i] = this.clientSideIllusionOffsets[1][i].scale(1.0D - d0).add(this.clientSideIllusionOffsets[0][i].scale(d0)); + } + +- return vec3s; ++ return avec3d; + } + } + + @Override + public boolean isAlliedTo(Entity entity) { +- return super.isAlliedTo(entity) +- || entity instanceof LivingEntity && ((LivingEntity)entity).getMobType() == MobType.ILLAGER && this.getTeam() == null && entity.getTeam() == null; ++ return super.isAlliedTo(entity) ? true : (entity instanceof LivingEntity && ((LivingEntity) entity).getMobType() == EnumMonsterType.ILLAGER ? this.getTeam() == null && entity.getTeam() == null : false); + } + + @Override +@@ -184,49 +184,36 @@ + } + + @Override +- public void applyRaidBuffs(int wave, boolean unusedFalse) { +- } ++ public void applyRaidBuffs(int wave, boolean unusedFalse) {} + + @Override + public void performRangedAttack(LivingEntity target, float distanceFactor) { +- ItemStack projectile = this.getProjectile(this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW))); +- AbstractArrow mobArrow = ProjectileUtil.getMobArrow(this, projectile, distanceFactor); +- double d = target.getX() - this.getX(); +- double d1 = target.getY(0.3333333333333333) - mobArrow.getY(); ++ ItemStack itemstack = this.getProjectile(this.getItemInHand(ProjectileUtil.getWeaponHoldingHand(this, Items.BOW))); ++ AbstractArrow entityarrow = ProjectileUtil.getMobArrow(this, itemstack, distanceFactor); ++ double d0 = target.getX() - this.getX(); ++ double d1 = target.getY(0.3333333333333333D) - entityarrow.getY(); + double d2 = target.getZ() - this.getZ(); +- double squareRoot = Math.sqrt(d * d + d2 * d2); +- mobArrow.shoot(d, d1 + squareRoot * 0.2F, d2, 1.6F, (float)(14 - this.level().getDifficulty().getId() * 4)); ++ double d3 = Math.sqrt(d0 * d0 + d2 * d2); ++ ++ entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.level().getDifficulty().getId() * 4)); + this.playSound(SoundEvents.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F)); +- this.level().addFreshEntity(mobArrow); ++ this.level().addFreshEntity(entityarrow); + } + + @Override +- public AbstractIllager.IllagerArmPose getArmPose() { +- if (this.isCastingSpell()) { +- return AbstractIllager.IllagerArmPose.SPELLCASTING; +- } else { +- return this.isAggressive() ? AbstractIllager.IllagerArmPose.BOW_AND_ARROW : AbstractIllager.IllagerArmPose.CROSSED; +- } ++ public AbstractIllager.a getArmPose() { ++ return this.isCastingSpell() ? AbstractIllager.a.SPELLCASTING : (this.isAggressive() ? AbstractIllager.a.BOW_AND_ARROW : AbstractIllager.a.CROSSED); + } + +- class IllusionerBlindnessSpellGoal extends SpellcasterIllager.SpellcasterUseSpellGoal { +- private int lastTargetId; ++ private class IllusionerMirrorSpellGoal extends SpellcasterIllager.SpellcasterUseSpellGoal { + +- @Override +- public boolean canUse() { +- return super.canUse() +- && Illusioner.this.getTarget() != null +- && Illusioner.this.getTarget().getId() != this.lastTargetId +- && Illusioner.this.level().getCurrentDifficultyAt(Illusioner.this.blockPosition()).isHarderThan((float)Difficulty.NORMAL.ordinal()); ++ IllusionerMirrorSpellGoal() { ++ super(); + } + + @Override +- public void start() { +- super.start(); +- LivingEntity target = Illusioner.this.getTarget(); +- if (target != null) { +- this.lastTargetId = target.getId(); +- } ++ public boolean canUse() { ++ return !super.canUse() ? false : !Illusioner.this.hasEffect(MobEffects.INVISIBILITY); + } + + @Override +@@ -236,55 +223,73 @@ + + @Override + protected int getCastingInterval() { +- return 180; ++ return 340; + } + + @Override + protected void performSpellCasting() { +- Illusioner.this.getTarget().addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 400), Illusioner.this); ++ Illusioner.this.addEffect(new MobEffectInstance(MobEffects.INVISIBILITY, 1200), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ILLUSION); // CraftBukkit + } + ++ @Nullable + @Override + protected SoundEvent getSpellPrepareSound() { +- return SoundEvents.ILLUSIONER_PREPARE_BLINDNESS; ++ return SoundEvents.ILLUSIONER_PREPARE_MIRROR; + } + + @Override + protected SpellcasterIllager.IllagerSpell getSpell() { +- return SpellcasterIllager.IllagerSpell.BLINDNESS; ++ return SpellcasterIllager.IllagerSpell.DISAPPEAR; + } + } + +- class IllusionerMirrorSpellGoal extends SpellcasterIllager.SpellcasterUseSpellGoal { ++ private class IllusionerBlindnessSpellGoal extends SpellcasterIllager.SpellcasterUseSpellGoal { ++ ++ private int lastTargetId; ++ ++ IllusionerBlindnessSpellGoal() { ++ super(); ++ } ++ + @Override + public boolean canUse() { +- return super.canUse() && !Illusioner.this.hasEffect(MobEffects.INVISIBILITY); ++ return !super.canUse() ? false : (Illusioner.this.getTarget() == null ? false : (Illusioner.this.getTarget().getId() == this.lastTargetId ? false : Illusioner.this.level().getCurrentDifficultyAt(Illusioner.this.blockPosition()).isHarderThan((float) Difficulty.NORMAL.ordinal()))); + } + + @Override ++ public void start() { ++ super.start(); ++ LivingEntity entityliving = Illusioner.this.getTarget(); ++ ++ if (entityliving != null) { ++ this.lastTargetId = entityliving.getId(); ++ } ++ ++ } ++ ++ @Override + protected int getCastingTime() { + return 20; + } + + @Override + protected int getCastingInterval() { +- return 340; ++ return 180; + } + + @Override + protected void performSpellCasting() { +- Illusioner.this.addEffect(new MobEffectInstance(MobEffects.INVISIBILITY, 1200)); ++ Illusioner.this.getTarget().addEffect(new MobEffectInstance(MobEffects.BLINDNESS, 400), Illusioner.this, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit + } + +- @Nullable + @Override + protected SoundEvent getSpellPrepareSound() { +- return SoundEvents.ILLUSIONER_PREPARE_MIRROR; ++ return SoundEvents.ILLUSIONER_PREPARE_BLINDNESS; + } + + @Override + protected SpellcasterIllager.IllagerSpell getSpell() { +- return SpellcasterIllager.IllagerSpell.DISAPPEAR; ++ return SpellcasterIllager.IllagerSpell.BLINDNESS; + } + } + } |