From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 12 Jun 2022 06:20:21 -0500 Subject: [PATCH] Fix decompile errors diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java index b6fc1b495e9173e625a7b2c856e79146734c4a9e..765dee56dd3a77e4bce137b84c4139202a5cef84 100644 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java @@ -92,7 +92,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationL @Override public Brain getBrain() { - return super.getBrain(); + return (Brain) super.getBrain(); // Purpur - decompile error } public static AttributeSupplier.Builder createAttributes() { @@ -141,8 +141,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationL @Override public boolean hurt(DamageSource source, float amount) { - Entity optional = source.getEntity(); - if (optional instanceof Player player) { + if (source.getEntity() instanceof Player player) { // Purpur - decompile error Optional optional = this.getBrain().getMemory(MemoryModuleType.LIKED_PLAYER); if (optional.isPresent() && player.getUUID().equals(optional.get())) { return false; diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..9e17e21a48892686e94a1c21b636695ab84eb7cd 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java @@ -105,7 +105,7 @@ public class Frog extends Animal { @Override public Brain getBrain() { - return super.getBrain(); + return (Brain) super.getBrain(); // Purpur - decompile error } @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java index 45152840f10c2e0731ac653595dc0e81557227c4..7d093e4cc3357abd205302a98cc7b06cf55229bc 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java @@ -67,7 +67,7 @@ public class Tadpole extends AbstractFish { @Override public Brain getBrain() { - return super.getBrain(); + return (Brain) super.getBrain(); // Purpur - decompile error } @Override @@ -215,8 +215,7 @@ public class Tadpole extends AbstractFish { } private void ageUp() { - Level frog = this.level; - if (frog instanceof ServerLevel serverLevel) { + if (this.level instanceof ServerLevel serverLevel) { // Purpur - decompile error Frog frog = EntityType.FROG.create(this.level); frog.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot()); frog.finalizeSpawn(serverLevel, this.level.getCurrentDifficultyAt(frog.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData)null, (CompoundTag)null); diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java @@ -90,11 +90,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { } private static void initIdleActivity(Brain brain) { - brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); + brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes<>(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne<>(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); // Purpur - decompile error } private static void initFightActivity(Brain brain) { - brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid()), MemoryModuleType.ATTACK_TARGET); + brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid<>()), MemoryModuleType.ATTACK_TARGET); // Purpur - decompile error } private Optional findNearestValidAttackTarget() { @@ -183,7 +183,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { @Override public Brain getBrain() { - return super.getBrain(); + return (Brain) super.getBrain(); // Purpur - decompile error } protected void updateActivity() { diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java index ac75c54e897565e340b66823caeed92ba1d1641a..769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java @@ -70,7 +70,7 @@ public class PiglinBrute extends AbstractPiglin { @Override public Brain getBrain() { - return super.getBrain(); + return (Brain) super.getBrain(); // Purpur - decompile error } @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..4366f7ff095c79a1f4444a27198f2613eb01fdc2 100644 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java @@ -361,7 +361,7 @@ public class Warden extends Monster implements VibrationListener.VibrationListen @Override public Brain getBrain() { - return super.getBrain(); + return (Brain) super.getBrain(); // Purpur - decompile error } @Override diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java index 5dc3605fed7fb2ff8cc6c965d1bf99c462e0b14a..bcc1ce196c1dbf60cf6ae73d95766dc41ed22012 100644 --- a/src/main/java/net/minecraft/world/level/block/Blocks.java +++ b/src/main/java/net/minecraft/world/level/block/Blocks.java @@ -1091,7 +1091,7 @@ public class Blocks { } private static Boolean ocelotOrParrot(BlockState state, BlockGetter world, BlockPos pos, EntityType type) { - return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT; + return type == EntityType.OCELOT || type == EntityType.PARROT; // Purpur - decompile error } private static BedBlock bed(DyeColor color) {