Another switch cleanup

legobmw99 · Jun 24, 2024 · 169a1e6 · 169a1e6
1 parent 380cda7
commit 169a1e6
Showing 1 changed file with 26 additions and 30 deletions.
diff --git a/src/main/java/com/legobmw99/allomancy/modules/powers/util/Emotional.java b/src/main/java/com/legobmw99/allomancy/modules/powers/util/Emotional.java
@@ -58,20 +58,17 @@ public static void riot(PathfinderMob target, Player allomancer, boolean enhance
 
                 target.setAggressive(true);
 
-                if (target instanceof Creeper creeper) {
-                    target.goalSelector.addGoal(1, new SwellGoal(creeper));
-                }
-                if (target instanceof Rabbit rabbit) {
-                    target.goalSelector.addGoal(1, new AIEvilAttack(rabbit));
-                }
-                if (target instanceof AbstractSkeleton skeleton) {
-                    target.goalSelector.addGoal(1, new RangedBowAttackGoal<>(skeleton, 1.0D, 20, 15.0F));
-                }
-                if (target instanceof Illusioner illusioner) {
-                    target.goalSelector.addGoal(1, new RangedBowAttackGoal<>(illusioner, 0.5D, 20, 15.0F));
-                }
-                if (target instanceof Pillager pillager) {
-                    target.goalSelector.addGoal(2, new RangedCrossbowAttackGoal<>(pillager, 1.0D, 8.0F));
+                switch (target) {
+                    case Creeper creeper -> target.goalSelector.addGoal(1, new SwellGoal(creeper));
+                    case Rabbit rabbit -> target.goalSelector.addGoal(1, new AIEvilAttack(rabbit));
+                    case AbstractSkeleton skeleton ->
+                            target.goalSelector.addGoal(1, new RangedBowAttackGoal<>(skeleton, 1.0D, 20, 15.0F));
+                    case Illusioner illusioner ->
+                            target.goalSelector.addGoal(1, new RangedBowAttackGoal<>(illusioner, 0.5D, 20, 15.0F));
+                    case Pillager pillager ->
+                            target.goalSelector.addGoal(2, new RangedCrossbowAttackGoal<>(pillager, 1.0D, 8.0F));
+                    default -> {
+                    }
                 }
             } else {
                 target
@@ -118,24 +115,23 @@ public static void soothe(PathfinderMob target, Player allomancer, boolean enhan
                 //Add new goals
                 target.goalSelector.addGoal(7, new LookAtPlayerGoal(target, Player.class, 6.0F));
 
-                if (target instanceof TamableAnimal animal) {
-                    if (Math.random() < 0.3) {
-                        animal.tame(allomancer);
+                switch (target) {
+                    case AbstractHorse horse -> {
+                        if (Math.random() < 0.3) {
+                            horse.tameWithName(allomancer);
+                        }
                     }
-                }
-                if (target instanceof AbstractHorse horse) {
-                    if (Math.random() < 0.3) {
-                        horse.tameWithName(allomancer);
+                    case TamableAnimal animal -> {
+                        if (Math.random() < 0.3) {
+                            animal.tame(allomancer);
+                        }
+                    }
+                    case Sheep unused -> target.goalSelector.addGoal(1, new EatBlockGoal(target));
+                    case Villager villager -> villager.onReputationEventFrom(ReputationEventType.TRADE, allomancer);
+                    case WanderingTrader unused ->
+                            target.goalSelector.addGoal(1, new TradeWithPlayerGoal((AbstractVillager) target));
+                    default -> {
                     }
-                }
-                if (target instanceof Sheep) {
-                    target.goalSelector.addGoal(1, new EatBlockGoal(target));
-                }
-                if (target instanceof Villager villager) {
-                    villager.onReputationEventFrom(ReputationEventType.TRADE, allomancer);
-                }
-                if (target instanceof WanderingTrader) {
-                    target.goalSelector.addGoal(1, new TradeWithPlayerGoal((AbstractVillager) target));
                 }
             } else { // Completely remove all AI if enhanced
                 target.setNoAi(true);