From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sun, 16 Jul 2023 11:37:32 +0300 Subject: [PATCH] Make entity goals public diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java index 997ab942be9f742804041b07d607e7dd6473ba96..aea0b36a52b2e9794daf8043f6a4279e52fec931 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -774,7 +774,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { return pos.closerThan(this.blockPosition(), (double) distance); } - private class BeePollinateGoal extends Bee.BaseBeeGoal { + public class BeePollinateGoal extends Bee.BaseBeeGoal { // DivineMC - private -> public private static final int MIN_POLLINATION_TICKS = 400; private static final int MIN_FIND_FLOWER_RETRY_COOLDOWN = 20; @@ -963,7 +963,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private class BeeLookControl extends org.purpurmc.purpur.controller.LookControllerWASD { // Purpur + public class BeeLookControl extends org.purpurmc.purpur.controller.LookControllerWASD { // Purpur // DivineMC - private -> public BeeLookControl(Mob entity) { super(entity); @@ -999,7 +999,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private class BeeEnterHiveGoal extends Bee.BaseBeeGoal { + public class BeeEnterHiveGoal extends Bee.BaseBeeGoal { // DivineMC - private -> public BeeEnterHiveGoal() { super(); @@ -1044,7 +1044,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private class BeeLocateHiveGoal extends Bee.BaseBeeGoal { + public class BeeLocateHiveGoal extends Bee.BaseBeeGoal { // DivineMC - private -> public BeeLocateHiveGoal() { super(); @@ -1276,7 +1276,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private class BeeGrowCropGoal extends Bee.BaseBeeGoal { + public class BeeGrowCropGoal extends Bee.BaseBeeGoal { // DivineMC - private -> public static final int GROW_CHANCE = 30; @@ -1340,7 +1340,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private class BeeWanderGoal extends Goal { + public class BeeWanderGoal extends Goal { // DivineMC - private -> public private static final int WANDER_THRESHOLD = 22; @@ -1387,7 +1387,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private class BeeHurtByOtherGoal extends HurtByTargetGoal { + public class BeeHurtByOtherGoal extends HurtByTargetGoal { // DivineMC - private -> public BeeHurtByOtherGoal(Bee entitybee) { super(entitybee); @@ -1407,7 +1407,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private static class BeeBecomeAngryTargetGoal extends NearestAttackableTargetGoal { + public static class BeeBecomeAngryTargetGoal extends NearestAttackableTargetGoal { // DivineMC - private -> public BeeBecomeAngryTargetGoal(Bee bee) { // Objects.requireNonNull(entitybee); // CraftBukkit - decompile error @@ -1438,7 +1438,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { } } - private abstract class BaseBeeGoal extends Goal { + public abstract class BaseBeeGoal extends Goal { // DivineMC - private -> public BaseBeeGoal() {} diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java index 6af5e1dfcfd739e0bc857f648c189151d5a795c8..149ff2637ca70e26cb7a36ae35ed82508183daa7 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java @@ -568,7 +568,7 @@ public class Cat extends TamableAnimal implements VariantHolder { } } - private static class CatRelaxOnOwnerGoal extends Goal { + public static class CatRelaxOnOwnerGoal extends Goal { // DivineMC - private -> public private final Cat cat; @Nullable @@ -714,7 +714,7 @@ public class Cat extends TamableAnimal implements VariantHolder { } } - private static class CatAvoidEntityGoal extends AvoidEntityGoal { + public static class CatAvoidEntityGoal extends AvoidEntityGoal { // DivineMC - private -> public private final Cat cat; diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java index d5becd13774f9a2ead77d58e777ffc9aea10cb60..7c9ed0f28116d4aad6bbabd5d710cd4bbfbd59dd 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java @@ -103,7 +103,7 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve super.registerGoals(); this.goalSelector.addGoal(0, new FloatGoal(this)); this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, 10.0F)); + this.goalSelector.addGoal(2, new HoldGroundAttackGoal(this, 10.0F)); this.goalSelector.addGoal(3, new RangedCrossbowAttackGoal<>(this, 1.0D, 8.0F)); this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D)); this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 15.0F, 1.0F)); diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java index 960b5e2c290f82501384f79d4653f47bedf926fb..1f382f864209a4c8f654d019b0a5907734d44d0d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java @@ -95,7 +95,7 @@ public class Vindicator extends AbstractIllager { this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur this.goalSelector.addGoal(1, new Vindicator.VindicatorBreakDoorGoal(this)); this.goalSelector.addGoal(2, new AbstractIllager.RaiderOpenDoorGoal(this)); - this.goalSelector.addGoal(3, new Raider.HoldGroundAttackGoal(this, 10.0F)); + this.goalSelector.addGoal(3, new HoldGroundAttackGoal(this, 10.0F)); this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0, false)); this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur this.targetSelector.addGoal(1, new HurtByTargetGoal(this, Raider.class).setAlertOthers()); diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java index b3912881892b4f1bca577761083c5da1568c8187..5e8c9177644896d8f9243c3e7ce903fcdc6e9fa2 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java @@ -355,7 +355,7 @@ public abstract class Raider extends PatrollingMonster { } } - private static class RaiderMoveThroughVillageGoal extends Goal { + public class RaiderMoveThroughVillageGoal extends Goal { // DivineMC - private -> public private final Raider raider; private final double speedModifier; @@ -503,7 +503,7 @@ public abstract class Raider extends PatrollingMonster { } } - public class HoldGroundAttackGoal extends Goal { + public static class HoldGroundAttackGoal extends Goal { // DivineMC - public -> public static private final Raider mob; private final float hostileRadiusSqr;