diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/ChargeCreeperGoal.java b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/ChargeCreeperGoal.java index 8deb17e..967fded 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/ChargeCreeperGoal.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/ChargeCreeperGoal.java @@ -2,7 +2,6 @@ package fathertoast.specialmobs.common.entity.ai.goal; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.ai.IAmmoUser; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.Goal; import net.minecraft.entity.monster.CreeperEntity; @@ -11,13 +10,10 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.EnumSet; import java.util.List; import java.util.function.BiPredicate; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault public class ChargeCreeperGoal extends Goal { private final BiPredicate targetPredicate; diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialGhastMeleeAttackGoal.java b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialGhastMeleeAttackGoal.java index 48e0aa7..862a424 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialGhastMeleeAttackGoal.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialGhastMeleeAttackGoal.java @@ -2,19 +2,15 @@ package fathertoast.specialmobs.common.entity.ai.goal; import fathertoast.specialmobs.common.entity.ai.SimpleFlyingMovementController; import fathertoast.specialmobs.common.entity.ghast._SpecialGhastEntity; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.controller.MovementController; import net.minecraft.entity.ai.goal.Goal; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.EnumSet; /** * Melee attack goal modified to function for ghasts. */ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault public class SpecialGhastMeleeAttackGoal extends Goal { private final _SpecialGhastEntity ghast; diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialHurtByTargetGoal.java b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialHurtByTargetGoal.java index fa8f05a..85ac507 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialHurtByTargetGoal.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/SpecialHurtByTargetGoal.java @@ -1,6 +1,5 @@ package fathertoast.specialmobs.common.entity.ai.goal; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.CreatureEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; @@ -8,7 +7,6 @@ import net.minecraft.entity.ai.goal.HurtByTargetGoal; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.util.math.AxisAlignedBB; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; /** @@ -16,8 +14,6 @@ import java.util.List; *

* The only two changes are: Allows the parent class to be specified; and Exclusions apply to all subclasses */ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault public class SpecialHurtByTargetGoal extends HurtByTargetGoal { private final Class parentClass; diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/package-info.java new file mode 100644 index 0000000..ca6564d --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/ai/goal/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.ai.goal; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/CinderBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/CinderBlazeEntity.java index f8864c2..13b6cf3 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/CinderBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/CinderBlazeEntity.java @@ -5,17 +5,12 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class CinderBlazeEntity extends _SpecialBlazeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/ConflagrationBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/ConflagrationBlazeEntity.java index 2fb59b1..91678e8 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/ConflagrationBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/ConflagrationBlazeEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -23,11 +22,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.UUID; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class ConflagrationBlazeEntity extends _SpecialBlazeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/EmberBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/EmberBlazeEntity.java index 72a1ca7..7a7788f 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/EmberBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/EmberBlazeEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -14,10 +13,6 @@ import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class EmberBlazeEntity extends _SpecialBlazeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/HellfireBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/HellfireBlazeEntity.java index 8c5ba09..bb6378b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/HellfireBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/HellfireBlazeEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.BlazeSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.Attributes; @@ -17,10 +16,6 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class HellfireBlazeEntity extends _SpecialBlazeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/InfernoBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/InfernoBlazeEntity.java index a61b002..5492ba2 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/InfernoBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/InfernoBlazeEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -16,10 +15,6 @@ import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class InfernoBlazeEntity extends _SpecialBlazeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/JoltBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/JoltBlazeEntity.java index 62b28ae..46ac398 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/JoltBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/JoltBlazeEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -26,10 +25,6 @@ import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.living.EntityTeleportEvent; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class JoltBlazeEntity extends _SpecialBlazeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/WildfireBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/WildfireBlazeEntity.java index 4d91677..95e6998 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/WildfireBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/WildfireBlazeEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.config.species.WildfireBlazeSpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; @@ -16,10 +15,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WildfireBlazeEntity extends _SpecialBlazeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/_SpecialBlazeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/_SpecialBlazeEntity.java index ccfeb72..0093809 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/blaze/_SpecialBlazeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/_SpecialBlazeEntity.java @@ -13,7 +13,6 @@ import fathertoast.specialmobs.common.entity.ai.goal.SpecialBlazeAttackGoal; import fathertoast.specialmobs.common.entity.ai.goal.SpecialHurtByTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -34,10 +33,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialBlazeEntity extends BlazeEntity implements IRangedAttackMob, ISpecialMob<_SpecialBlazeEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/blaze/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/blaze/package-info.java new file mode 100644 index 0000000..0628ea5 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/blaze/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.blaze; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/BabyCaveSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/BabyCaveSpiderEntity.java index 10ce21a..aec198c 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/BabyCaveSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/BabyCaveSpiderEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BabyCaveSpiderEntity extends _SpecialCaveSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/FlyingCaveSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/FlyingCaveSpiderEntity.java index 3f3b95f..4ce0093 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/FlyingCaveSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/FlyingCaveSpiderEntity.java @@ -6,16 +6,11 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FlyingCaveSpiderEntity extends _SpecialCaveSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/MotherCaveSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/MotherCaveSpiderEntity.java index ba0c7ce..5024adc 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/MotherCaveSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/MotherCaveSpiderEntity.java @@ -3,11 +3,10 @@ package fathertoast.specialmobs.common.entity.cavespider; import fathertoast.specialmobs.common.bestiary.BestiaryInfo; import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; -import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.config.species.MotherSpiderSpeciesConfig; +import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -20,10 +19,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class MotherCaveSpiderEntity extends _SpecialCaveSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WebCaveSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WebCaveSpiderEntity.java index 2fc6f8d..4ab19f0 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WebCaveSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WebCaveSpiderEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.config.species.WebSpiderSpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -19,10 +18,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WebCaveSpiderEntity extends _SpecialCaveSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WitchCaveSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WitchCaveSpiderEntity.java index a52b7ab..1ce242b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WitchCaveSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/WitchCaveSpiderEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -15,10 +14,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectType; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WitchCaveSpiderEntity extends _SpecialCaveSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/_SpecialCaveSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/_SpecialCaveSpiderEntity.java index cce8573..2e99e7b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/_SpecialCaveSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/_SpecialCaveSpiderEntity.java @@ -10,7 +10,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -29,10 +28,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialCaveSpiderEntity extends CaveSpiderEntity implements ISpecialMob<_SpecialCaveSpiderEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/cavespider/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/package-info.java new file mode 100644 index 0000000..507bc77 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/cavespider/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.cavespider; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DarkCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DarkCreeperEntity.java index 4ffb983..b95900d 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DarkCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DarkCreeperEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; @@ -20,11 +19,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class DarkCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DeathCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DeathCreeperEntity.java index 2645049..3ca22e4 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DeathCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DeathCreeperEntity.java @@ -7,17 +7,12 @@ import fathertoast.specialmobs.common.config.species.CreeperSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class DeathCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DirtCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DirtCreeperEntity.java index d86bd7a..f25bc8b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DirtCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DirtCreeperEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; @@ -16,10 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class DirtCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DoomCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DoomCreeperEntity.java index 9f86911..c6a436a 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DoomCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DoomCreeperEntity.java @@ -6,18 +6,14 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.AreaEffectCloudEntity; import net.minecraft.entity.EntityType; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class DoomCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DrowningCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DrowningCreeperEntity.java index 262f490..b49ea72 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/DrowningCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/DrowningCreeperEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootEntryItemBuilder; import fathertoast.specialmobs.datagen.loot.LootPoolBuilder; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; @@ -22,10 +21,6 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IServerWorld; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class DrowningCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/EnderCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/EnderCreeperEntity.java index 6c11ec6..e699483 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/EnderCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/EnderCreeperEntity.java @@ -9,7 +9,6 @@ import fathertoast.specialmobs.common.core.SpecialMobs; import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.Attributes; @@ -33,13 +32,10 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.living.EntityTeleportEvent; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.EnumSet; import java.util.UUID; import java.util.function.Predicate; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class EnderCreeperEntity extends _SpecialCreeperEntity implements IAngerable { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java index 0203fd1..cd64278 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java @@ -8,15 +8,10 @@ import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FireCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/GravelCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/GravelCreeperEntity.java index 7ef4075..12c8cfe 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/GravelCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/GravelCreeperEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; import net.minecraft.entity.item.FallingBlockEntity; @@ -17,10 +16,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GravelCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/JumpingCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/JumpingCreeperEntity.java index 0a724d2..a75c810 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/JumpingCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/JumpingCreeperEntity.java @@ -7,16 +7,11 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class JumpingCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java index 8bcf326..d4ed789 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java @@ -6,16 +6,11 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.item.Items; import net.minecraft.world.World; import net.minecraft.world.storage.IServerWorldInfo; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class LightningCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/MiniCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/MiniCreeperEntity.java index 705d043..1c58ff3 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/MiniCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/MiniCreeperEntity.java @@ -5,15 +5,10 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class MiniCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/SkeletonCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/SkeletonCreeperEntity.java index 8e2a0a1..a2dc92d 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/SkeletonCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/SkeletonCreeperEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.CreatureAttribute; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; @@ -23,10 +22,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class SkeletonCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/SplittingCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/SplittingCreeperEntity.java index 3c79ce6..5454d5c 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/SplittingCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/SplittingCreeperEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.config.species.SplittingCreeperSpeciesConf import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -20,10 +19,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class SplittingCreeperEntity extends _SpecialCreeperEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/_SpecialCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/_SpecialCreeperEntity.java index 26965ff..49d9d37 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/_SpecialCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/_SpecialCreeperEntity.java @@ -12,7 +12,6 @@ import fathertoast.specialmobs.common.entity.ai.IExplodingMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -34,12 +33,9 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialCreeperEntity extends CreeperEntity implements IExplodingMob, ISpecialMob<_SpecialCreeperEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/package-info.java new file mode 100644 index 0000000..931ead5 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.creeper; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/BlindingEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/BlindingEndermanEntity.java index 7762104..d57ac8b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/BlindingEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/BlindingEndermanEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.item.Items; @@ -13,10 +12,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BlindingEndermanEntity extends _SpecialEndermanEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/IcyEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/IcyEndermanEntity.java index f7fe6f0..f3de53b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/IcyEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/IcyEndermanEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.FluidPathNavigator; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.enchantment.FrostWalkerEnchantment; @@ -31,10 +30,6 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.living.EntityTeleportEvent; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class IcyEndermanEntity extends _SpecialEndermanEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java index 78a05db..4f58059 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -15,10 +14,6 @@ import net.minecraft.item.Items; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class LightningEndermanEntity extends _SpecialEndermanEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/MiniEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/MiniEndermanEntity.java index a291569..5236f17 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/MiniEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/MiniEndermanEntity.java @@ -5,15 +5,10 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class MiniEndermanEntity extends _SpecialEndermanEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/MirageEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/MirageEndermanEntity.java index cbb2061..1b5472a 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/MirageEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/MirageEndermanEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -14,10 +13,6 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class MirageEndermanEntity extends _SpecialEndermanEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/ThiefEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/ThiefEndermanEntity.java index 55ef519..a30133a 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/ThiefEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/ThiefEndermanEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -17,10 +16,6 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.living.EntityTeleportEvent; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class ThiefEndermanEntity extends _SpecialEndermanEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/_SpecialEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/_SpecialEndermanEntity.java index 5480ec3..8d32379 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/_SpecialEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/_SpecialEndermanEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -25,10 +24,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialEndermanEntity extends EndermanEntity implements ISpecialMob<_SpecialEndermanEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/package-info.java new file mode 100644 index 0000000..a9e376d --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.enderman; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/BabyGhastEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/BabyGhastEntity.java index 33027b9..31f240a 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ghast/BabyGhastEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/BabyGhastEntity.java @@ -5,17 +5,12 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.util.SoundEvent; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BabyGhastEntity extends _SpecialGhastEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/CorporealShiftGhastEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/CorporealShiftGhastEntity.java index 4461587..57c3af1 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ghast/CorporealShiftGhastEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/CorporealShiftGhastEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.core.register.SMItems; import fathertoast.specialmobs.common.entity.projectile.CorporealShiftFireballEntity; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.Attributes; @@ -22,10 +21,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class CorporealShiftGhastEntity extends _SpecialGhastEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/FighterGhastEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/FighterGhastEntity.java index 130534c..ffc58f6 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ghast/FighterGhastEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/FighterGhastEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -14,10 +13,6 @@ import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FighterGhastEntity extends _SpecialGhastEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/KingGhastEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/KingGhastEntity.java index 545c7e2..4f4f963 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ghast/KingGhastEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/KingGhastEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class KingGhastEntity extends _SpecialGhastEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/QueenGhastEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/QueenGhastEntity.java index 989bad5..8d94e09 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ghast/QueenGhastEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/QueenGhastEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.QueenGhastSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.LivingEntity; @@ -19,10 +18,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class QueenGhastEntity extends _SpecialGhastEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/UnholyGhastEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/UnholyGhastEntity.java index 53dd5b9..45ea058 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ghast/UnholyGhastEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/UnholyGhastEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.CreatureAttribute; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -18,10 +17,6 @@ import net.minecraft.item.Items; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class UnholyGhastEntity extends _SpecialGhastEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/_SpecialGhastEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/_SpecialGhastEntity.java index 87671c5..fbf1db8 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ghast/_SpecialGhastEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/_SpecialGhastEntity.java @@ -13,7 +13,6 @@ import fathertoast.specialmobs.common.entity.ai.goal.SpecialGhastLookAroundGoal; import fathertoast.specialmobs.common.entity.ai.goal.SpecialGhastMeleeAttackGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -37,10 +36,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialGhastEntity extends GhastEntity implements IRangedAttackMob, ISpecialMob<_SpecialGhastEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ghast/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/ghast/package-info.java new file mode 100644 index 0000000..029ae5b --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/ghast/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.ghast; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/BouncingMagmaCubeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/BouncingMagmaCubeEntity.java index bc7218c..bb8b965 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/BouncingMagmaCubeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/BouncingMagmaCubeEntity.java @@ -9,7 +9,6 @@ import fathertoast.specialmobs.common.entity.ai.FluidPathNavigator; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.fluid.Fluid; @@ -20,10 +19,6 @@ import net.minecraft.pathfinding.PathNodeType; import net.minecraft.tags.FluidTags; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BouncingMagmaCubeEntity extends _SpecialMagmaCubeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/HardenedMagmaCubeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/HardenedMagmaCubeEntity.java index 659bfa5..e7b7f72 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/HardenedMagmaCubeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/HardenedMagmaCubeEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -15,10 +14,6 @@ import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class HardenedMagmaCubeEntity extends _SpecialMagmaCubeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/StickyMagmaCubeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/StickyMagmaCubeEntity.java index 6ee6cef..953bad6 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/StickyMagmaCubeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/StickyMagmaCubeEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -14,11 +13,8 @@ import net.minecraft.item.Items; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class StickyMagmaCubeEntity extends _SpecialMagmaCubeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/VolatileMagmaCubeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/VolatileMagmaCubeEntity.java index 05c1f79..f091588 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/VolatileMagmaCubeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/VolatileMagmaCubeEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.ai.goal.SpecialSwellGoal; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.AreaEffectCloudEntity; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; @@ -24,12 +23,9 @@ import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class VolatileMagmaCubeEntity extends _SpecialMagmaCubeEntity implements IExplodingMob { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/_SpecialMagmaCubeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/_SpecialMagmaCubeEntity.java index a45d585..2e9be01 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/_SpecialMagmaCubeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/_SpecialMagmaCubeEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierManager; @@ -29,10 +28,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialMagmaCubeEntity extends MagmaCubeEntity implements ISpecialMob<_SpecialMagmaCubeEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/magmacube/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/package-info.java new file mode 100644 index 0000000..574eb5c --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/magmacube/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.magmacube; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/package-info.java new file mode 100644 index 0000000..bafdb36 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/projectile/CorporealShiftFireballEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/projectile/CorporealShiftFireballEntity.java index 86aea98..e107a3c 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/projectile/CorporealShiftFireballEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/projectile/CorporealShiftFireballEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.core.register.SMEntities; import fathertoast.specialmobs.common.core.register.SMItems; import fathertoast.specialmobs.common.entity.ghast.CorporealShiftGhastEntity; import fathertoast.specialmobs.common.util.References; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -26,16 +25,12 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.Constants; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault public class CorporealShiftFireballEntity extends AbstractFireballEntity { private static final DataParameter CORPOREAL = EntityDataManager.defineId( CorporealShiftFireballEntity.class, DataSerializers.BOOLEAN ); diff --git a/src/main/java/fathertoast/specialmobs/common/entity/projectile/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/projectile/package-info.java new file mode 100644 index 0000000..3a7cea6 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/projectile/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.projectile; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/BlindingSilverfishEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/BlindingSilverfishEntity.java index b2cd3ec..16c214c 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/BlindingSilverfishEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/BlindingSilverfishEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -15,10 +14,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BlindingSilverfishEntity extends _SpecialSilverfishEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FishingSilverfishEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FishingSilverfishEntity.java index ae2c0fb..df88d0c 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FishingSilverfishEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FishingSilverfishEntity.java @@ -10,16 +10,11 @@ import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootEntryItemBuilder; import fathertoast.specialmobs.datagen.loot.LootPoolBuilder; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FishingSilverfishEntity extends _SpecialSilverfishEntity implements IAngler { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FlyingSilverfishEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FlyingSilverfishEntity.java index 4e3c9fb..38a0ff7 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FlyingSilverfishEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/FlyingSilverfishEntity.java @@ -6,16 +6,11 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FlyingSilverfishEntity extends _SpecialSilverfishEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/PoisonSilverfishEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/PoisonSilverfishEntity.java index 085deca..d363bf6 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/PoisonSilverfishEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/PoisonSilverfishEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -15,10 +14,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class PoisonSilverfishEntity extends _SpecialSilverfishEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/ToughSilverfishEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/ToughSilverfishEntity.java index ddb371e..b31de03 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/ToughSilverfishEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/ToughSilverfishEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class ToughSilverfishEntity extends _SpecialSilverfishEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/_SpecialSilverfishEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/_SpecialSilverfishEntity.java index f93b689..0ebdf87 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/_SpecialSilverfishEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/_SpecialSilverfishEntity.java @@ -12,7 +12,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.goal.SpecialHurtByTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -32,11 +31,8 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialSilverfishEntity extends SilverfishEntity implements ISpecialMob<_SpecialSilverfishEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/silverfish/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/silverfish/package-info.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/BruteSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/BruteSkeletonEntity.java index fbf1e01..4b7e686 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/BruteSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/BruteSkeletonEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -19,10 +18,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BruteSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java index 5c9eb5f..5d18346 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.projectile.AbstractArrowEntity; @@ -13,10 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FireSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GatlingSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GatlingSkeletonEntity.java index a456203..7262c63 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GatlingSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GatlingSkeletonEntity.java @@ -7,16 +7,11 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GatlingSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GiantSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GiantSkeletonEntity.java index e6a6d9e..254327e 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GiantSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/GiantSkeletonEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GiantSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/KnightSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/KnightSkeletonEntity.java index 21f27c5..352b792 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/KnightSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/KnightSkeletonEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -20,10 +19,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class KnightSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java index d7d3c95..9026928 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java @@ -10,7 +10,6 @@ import fathertoast.specialmobs.common.entity.ai.INinja; import fathertoast.specialmobs.common.entity.ai.goal.NinjaGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.*; @@ -32,11 +31,8 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.Optional; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class NinjaSkeletonEntity extends _SpecialSkeletonEntity implements INinja { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/PoisonSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/PoisonSkeletonEntity.java index 05cd388..6c90494 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/PoisonSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/PoisonSkeletonEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -20,10 +19,6 @@ import net.minecraft.potion.PotionUtils; import net.minecraft.potion.Potions; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class PoisonSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SniperSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SniperSkeletonEntity.java index 50b6bed..7111dbc 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SniperSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SniperSkeletonEntity.java @@ -7,16 +7,11 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class SniperSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java index 80af62a..cc38d60 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -17,10 +16,6 @@ import net.minecraft.item.Items; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class SpitfireSkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/StraySkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/StraySkeletonEntity.java index 615f8d9..a470eac 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/StraySkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/StraySkeletonEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -22,10 +21,6 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class StraySkeletonEntity extends _SpecialSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/_SpecialSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/_SpecialSkeletonEntity.java index 1305064..1ad9421 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/_SpecialSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/_SpecialSkeletonEntity.java @@ -10,7 +10,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -45,10 +44,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialSkeletonEntity extends AbstractSkeletonEntity implements ISpecialMob<_SpecialSkeletonEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/package-info.java new file mode 100644 index 0000000..a6e7edf --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.skeleton; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/BlackberrySlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/BlackberrySlimeEntity.java index 4decc8a..14fab28 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/BlackberrySlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/BlackberrySlimeEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.ai.goal.SpecialSwellGoal; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.AreaEffectCloudEntity; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; @@ -24,12 +23,9 @@ import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BlackberrySlimeEntity extends _SpecialSlimeEntity implements IExplodingMob { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/BlueberrySlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/BlueberrySlimeEntity.java index 6942f16..9ec96eb 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/BlueberrySlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/BlueberrySlimeEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.FluidPathNavigator; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.fluid.Fluid; @@ -21,10 +20,6 @@ import net.minecraft.pathfinding.PathNodeType; import net.minecraft.tags.FluidTags; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BlueberrySlimeEntity extends _SpecialSlimeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/CaramelSlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/CaramelSlimeEntity.java index 1583ad3..fa50389 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/CaramelSlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/CaramelSlimeEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -17,11 +16,8 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class CaramelSlimeEntity extends _SpecialSlimeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/GrapeSlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/GrapeSlimeEntity.java index b97ca0a..653f927 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/GrapeSlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/GrapeSlimeEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; @@ -15,10 +14,6 @@ import net.minecraft.particles.ItemParticleData; import net.minecraft.particles.ParticleTypes; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GrapeSlimeEntity extends _SpecialSlimeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java index 87dd55c..e2f7121 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.ExplosionHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -20,10 +19,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class LemonSlimeEntity extends _SpecialSlimeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java index f7a97ca..0c92411 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.FluidPathNavigator; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; @@ -21,10 +20,6 @@ import net.minecraft.pathfinding.PathNodeType; import net.minecraft.tags.FluidTags; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class StrawberrySlimeEntity extends _SpecialSlimeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/WatermelonSlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/WatermelonSlimeEntity.java index 140d928..a5c76ef 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/WatermelonSlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/WatermelonSlimeEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -18,10 +17,6 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WatermelonSlimeEntity extends _SpecialSlimeEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/_SpecialSlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/_SpecialSlimeEntity.java index ae0cbab..e729d11 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/_SpecialSlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/_SpecialSlimeEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierManager; @@ -30,10 +29,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialSlimeEntity extends SlimeEntity implements ISpecialMob<_SpecialSlimeEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/package-info.java new file mode 100644 index 0000000..7acedca --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.slime; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/BabySpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/BabySpiderEntity.java index 5fdfc70..f3d9df0 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/BabySpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/BabySpiderEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BabySpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/DesertSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/DesertSpiderEntity.java index a70be76..4737d60 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/DesertSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/DesertSpiderEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.Config; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -17,10 +16,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class DesertSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/FlyingSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/FlyingSpiderEntity.java index 686e828..d08a972 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/FlyingSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/FlyingSpiderEntity.java @@ -6,16 +6,11 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.ai.goal.SpecialLeapAtTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FlyingSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/GiantSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/GiantSpiderEntity.java index 1c815e8..81f864b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/GiantSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/GiantSpiderEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GiantSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/HungrySpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/HungrySpiderEntity.java index 3fd6ada..f4b8f38 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/HungrySpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/HungrySpiderEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -21,11 +20,8 @@ import net.minecraft.util.SoundEvents; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.UUID; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class HungrySpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/MotherSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/MotherSpiderEntity.java index 88edfb9..561f38a 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/MotherSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/MotherSpiderEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.MotherSpiderSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -20,10 +19,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class MotherSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/PaleSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/PaleSpiderEntity.java index 12f02bd..99432ec 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/PaleSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/PaleSpiderEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -16,10 +15,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class PaleSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/PoisonSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/PoisonSpiderEntity.java index 220a1b5..6fff102 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/PoisonSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/PoisonSpiderEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -15,10 +14,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class PoisonSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/WebSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/WebSpiderEntity.java index 6142787..9f0dee1 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/WebSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/WebSpiderEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.config.species.WebSpiderSpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -19,10 +18,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WebSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/WitchSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/WitchSpiderEntity.java index 138aac6..16a6edb 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/WitchSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/WitchSpiderEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -15,10 +14,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectType; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WitchSpiderEntity extends _SpecialSpiderEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/_SpecialSpiderEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/_SpecialSpiderEntity.java index 9eefbdb..c79c625 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/spider/_SpecialSpiderEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/_SpecialSpiderEntity.java @@ -10,7 +10,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -29,10 +28,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialSpiderEntity extends SpiderEntity implements ISpecialMob<_SpecialSpiderEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/spider/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/spider/package-info.java new file mode 100644 index 0000000..855f4f0 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/spider/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.spider; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witch/DominationWitchEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witch/DominationWitchEntity.java index 2820fb7..229e1ac 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witch/DominationWitchEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witch/DominationWitchEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.Attributes; @@ -17,12 +16,9 @@ import net.minecraft.potion.Potions; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.Collection; import java.util.Collections; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class DominationWitchEntity extends _SpecialWitchEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witch/ShadowsWitchEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witch/ShadowsWitchEntity.java index b9f47d1..412375b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witch/ShadowsWitchEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witch/ShadowsWitchEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; @@ -16,12 +15,9 @@ import net.minecraft.potion.PotionUtils; import net.minecraft.potion.Potions; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.Arrays; import java.util.Collection; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class ShadowsWitchEntity extends _SpecialWitchEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witch/UndeadWitchEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witch/UndeadWitchEntity.java index 762cbbd..2beb642 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witch/UndeadWitchEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witch/UndeadWitchEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.config.species.UndeadWitchSpeciesConfig; import fathertoast.specialmobs.common.entity.skeleton._SpecialSkeletonEntity; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.CreatureAttribute; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -23,10 +22,6 @@ import net.minecraft.util.SoundEvents; import net.minecraft.world.IServerWorld; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class UndeadWitchEntity extends _SpecialWitchEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witch/WildsWitchEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witch/WildsWitchEntity.java index 789a262..7cbf5b2 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witch/WildsWitchEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witch/WildsWitchEntity.java @@ -9,7 +9,6 @@ import fathertoast.specialmobs.common.entity.spider.BabySpiderEntity; import fathertoast.specialmobs.common.entity.spider._SpecialSpiderEntity; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.ItemStack; @@ -25,10 +24,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WildsWitchEntity extends _SpecialWitchEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witch/WindWitchEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witch/WindWitchEntity.java index 218db00..0b81f5d 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witch/WindWitchEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witch/WindWitchEntity.java @@ -8,7 +8,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.FluidPathNavigator; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -32,10 +31,6 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.living.EntityTeleportEvent; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class WindWitchEntity extends _SpecialWitchEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witch/_SpecialWitchEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witch/_SpecialWitchEntity.java index 224f89c..f9bfcd5 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witch/_SpecialWitchEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witch/_SpecialWitchEntity.java @@ -9,7 +9,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -40,13 +39,10 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.Collection; import java.util.List; import java.util.UUID; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialWitchEntity extends WitchEntity implements ISpecialMob<_SpecialWitchEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witch/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/witch/package-info.java new file mode 100644 index 0000000..9a805e9 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/witch/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.witch; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/BruteWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/BruteWitherSkeletonEntity.java index a01b8eb..61b5a17 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/BruteWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/BruteWitherSkeletonEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -19,10 +18,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BruteWitherSkeletonEntity extends _SpecialWitherSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GatlingWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GatlingWitherSkeletonEntity.java index 17306ac..b315893 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GatlingWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GatlingWitherSkeletonEntity.java @@ -7,16 +7,11 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GatlingWitherSkeletonEntity extends _SpecialWitherSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GiantWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GiantWitherSkeletonEntity.java index b039d94..36a6a1e 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GiantWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/GiantWitherSkeletonEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GiantWitherSkeletonEntity extends _SpecialWitherSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/KnightWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/KnightWitherSkeletonEntity.java index 793febb..ec2d37b 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/KnightWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/KnightWitherSkeletonEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -20,10 +19,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class KnightWitherSkeletonEntity extends _SpecialWitherSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java index 995d5a1..48b5b83 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java @@ -10,7 +10,6 @@ import fathertoast.specialmobs.common.entity.ai.INinja; import fathertoast.specialmobs.common.entity.ai.goal.NinjaGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.*; @@ -32,11 +31,8 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.Optional; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class NinjaWitherSkeletonEntity extends _SpecialWitherSkeletonEntity implements INinja { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SniperWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SniperWitherSkeletonEntity.java index a6ae9f4..4f8aa63 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SniperWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SniperWitherSkeletonEntity.java @@ -7,16 +7,11 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class SniperWitherSkeletonEntity extends _SpecialWitherSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java index 170ac49..48a5873 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig; import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -17,10 +16,6 @@ import net.minecraft.item.Items; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class SpitfireWitherSkeletonEntity extends _SpecialWitherSkeletonEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java index fb315f4..808e186 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java @@ -10,7 +10,6 @@ import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.SpecialMobData; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -42,10 +41,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialWitherSkeletonEntity extends WitherSkeletonEntity implements ISpecialMob<_SpecialWitherSkeletonEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/package-info.java new file mode 100644 index 0000000..2fa7d81 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.witherskeleton; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/BruteZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/BruteZombieEntity.java index 1d5a2f4..d82d68e 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/BruteZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/BruteZombieEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -19,10 +18,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BruteZombieEntity extends _SpecialZombieEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java index 674584c..d0c259e 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java @@ -5,7 +5,6 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.projectile.AbstractArrowEntity; @@ -16,10 +15,6 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FireZombieEntity extends _SpecialZombieEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/FishingZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/FishingZombieEntity.java index 1b2548e..42742e4 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/FishingZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/FishingZombieEntity.java @@ -12,7 +12,6 @@ import fathertoast.specialmobs.datagen.loot.LootEntryItemBuilder; import fathertoast.specialmobs.datagen.loot.LootHelper; import fathertoast.specialmobs.datagen.loot.LootPoolBuilder; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -30,10 +29,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FishingZombieEntity extends _SpecialZombieEntity implements IAngler { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/GiantZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/GiantZombieEntity.java index 076fad1..01e9c7a 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/GiantZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/GiantZombieEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GiantZombieEntity extends _SpecialZombieEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/HungryZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/HungryZombieEntity.java index 860560a..b963d86 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/HungryZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/HungryZombieEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.player.PlayerEntity; @@ -20,10 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class HungryZombieEntity extends _SpecialZombieEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/HuskZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/HuskZombieEntity.java index d75e41f..409bbd5 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/HuskZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/HuskZombieEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -22,10 +21,6 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class HuskZombieEntity extends _SpecialZombieEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/MadScientistZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/MadScientistZombieEntity.java index 47518ee..78df96d 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/MadScientistZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/MadScientistZombieEntity.java @@ -12,7 +12,6 @@ import fathertoast.specialmobs.common.entity.ai.IAmmoUser; import fathertoast.specialmobs.common.entity.ai.goal.ChargeCreeperGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.*; import net.minecraft.entity.monster.CreeperEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -25,11 +24,8 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; import java.util.function.BiPredicate; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class MadScientistZombieEntity extends _SpecialZombieEntity implements IAmmoUser { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/PlagueZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/PlagueZombieEntity.java index f29a21f..118f607 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/PlagueZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/PlagueZombieEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -18,10 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class PlagueZombieEntity extends _SpecialZombieEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/_SpecialZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/_SpecialZombieEntity.java index bc789d1..26540cf 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/_SpecialZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/_SpecialZombieEntity.java @@ -12,7 +12,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.goal.SpecialHurtByTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -43,10 +42,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialZombieEntity extends ZombieEntity implements IRangedAttackMob, ISpecialMob<_SpecialZombieEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/package-info.java new file mode 100644 index 0000000..60f1ab7 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.zombie; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/BruteZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/BruteZombifiedPiglinEntity.java index a737129..ee60f43 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/BruteZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/BruteZombifiedPiglinEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.projectile.AbstractArrowEntity; @@ -21,10 +20,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class BruteZombifiedPiglinEntity extends _SpecialZombifiedPiglinEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/FishingZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/FishingZombifiedPiglinEntity.java index d0be72b..9befadf 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/FishingZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/FishingZombifiedPiglinEntity.java @@ -12,7 +12,6 @@ import fathertoast.specialmobs.datagen.loot.LootEntryItemBuilder; import fathertoast.specialmobs.datagen.loot.LootHelper; import fathertoast.specialmobs.datagen.loot.LootPoolBuilder; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -30,10 +29,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class FishingZombifiedPiglinEntity extends _SpecialZombifiedPiglinEntity implements IAngler { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/GiantZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/GiantZombifiedPiglinEntity.java index 9f031e4..770b97c 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/GiantZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/GiantZombifiedPiglinEntity.java @@ -5,16 +5,11 @@ import fathertoast.specialmobs.common.bestiary.MobFamily; import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class GiantZombifiedPiglinEntity extends _SpecialZombifiedPiglinEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/HungryZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/HungryZombifiedPiglinEntity.java index 10ae268..6ddd43d 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/HungryZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/HungryZombifiedPiglinEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.player.PlayerEntity; @@ -20,10 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class HungryZombifiedPiglinEntity extends _SpecialZombifiedPiglinEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/KnightZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/KnightZombifiedPiglinEntity.java index 2681680..9f4194f 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/KnightZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/KnightZombifiedPiglinEntity.java @@ -7,7 +7,6 @@ import fathertoast.specialmobs.common.config.species.SpeciesConfig; import fathertoast.specialmobs.common.config.species.ZombieSpeciesConfig; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.entity.EntityType; import net.minecraft.entity.ILivingEntityData; import net.minecraft.entity.SpawnReason; @@ -20,10 +19,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class KnightZombifiedPiglinEntity extends _SpecialZombifiedPiglinEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/PlagueZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/PlagueZombifiedPiglinEntity.java index 16fb635..f8d0c16 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/PlagueZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/PlagueZombifiedPiglinEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -18,10 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class PlagueZombifiedPiglinEntity extends _SpecialZombifiedPiglinEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/VampireZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/VampireZombifiedPiglinEntity.java index 79b0f27..82de371 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/VampireZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/VampireZombifiedPiglinEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -21,10 +20,6 @@ import net.minecraft.potion.Effects; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class VampireZombifiedPiglinEntity extends _SpecialZombifiedPiglinEntity { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/_SpecialZombifiedPiglinEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/_SpecialZombifiedPiglinEntity.java index 61beada..0f8f4ce 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/_SpecialZombifiedPiglinEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/_SpecialZombifiedPiglinEntity.java @@ -12,7 +12,6 @@ import fathertoast.specialmobs.common.entity.ai.AIHelper; import fathertoast.specialmobs.common.entity.ai.goal.SpecialHurtByTargetGoal; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.entity.*; import net.minecraft.entity.ai.attributes.AttributeModifierMap; @@ -42,10 +41,7 @@ import net.minecraft.world.IServerWorld; import net.minecraft.world.World; import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault @SpecialMob public class _SpecialZombifiedPiglinEntity extends ZombifiedPiglinEntity implements IRangedAttackMob, ISpecialMob<_SpecialZombifiedPiglinEntity> { diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/package-info.java b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/package-info.java new file mode 100644 index 0000000..ea04f84 --- /dev/null +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombifiedpiglin/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package fathertoast.specialmobs.common.entity.zombifiedpiglin; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file