From cbc36366de06b29cccd4118c220fc09c5c9debda Mon Sep 17 00:00:00 2001 From: Al Winfy <20421383+Alwinfy@users.noreply.github.com> Date: Sun, 7 Jun 2020 21:48:55 -0500 Subject: [PATCH] Fix all (non-deprecation) compiler warnings (#3321) * Fix all (non-deprecation) compiler warnings * satisfy spotless * use a method ref over a lambda --- .../java/vazkii/botania/api/mana/spark/SparkHelper.java | 3 ++- .../vazkii/botania/client/model/armor/ModelArmor.java | 2 +- .../patchouli/processor/MultiCraftingProcessor.java | 4 ++-- .../client/render/tile/RenderTileFloatingFlower.java | 2 +- .../block/subtile/functional/SubTileDaffomill.java | 2 +- .../block/subtile/functional/SubTileTigerseye.java | 5 +++++ .../vazkii/botania/common/block/tile/TileAlfPortal.java | 3 ++- .../botania/common/block/tile/TileSparkChanger.java | 2 +- .../vazkii/botania/common/block/tile/mana/TilePool.java | 4 ++-- .../botania/common/block/tile/mana/TileSpreader.java | 5 +++-- .../vazkii/botania/common/core/BotaniaCreativeTab.java | 2 +- .../common/core/handler/ExoflameFurnaceHandler.java | 2 +- .../vazkii/botania/common/core/handler/IMCHandler.java | 1 + .../botania/common/core/helper/ExperienceHelper.java | 2 +- .../vazkii/botania/common/core/loot/LootHandler.java | 2 +- .../vazkii/botania/common/entity/EntityDoppleganger.java | 2 +- .../vazkii/botania/common/entity/EntityMagicMissile.java | 4 ++-- .../java/vazkii/botania/common/item/ItemTwigWand.java | 1 + .../vazkii/botania/common/item/brew/ItemBrewBase.java | 4 ++-- .../equipment/armor/elementium/ItemElementiumArmor.java | 2 +- .../equipment/armor/manasteel/ItemManasteelArmor.java | 9 +++++---- .../equipment/armor/manaweave/ItemManaweaveArmor.java | 2 +- .../equipment/armor/terrasteel/ItemTerrasteelArmor.java | 2 +- .../common/item/equipment/bauble/ItemDivaCharm.java | 5 +++-- .../common/item/equipment/bauble/ItemKnockbackBelt.java | 4 ++-- .../common/item/equipment/bauble/ItemTravelBelt.java | 4 ++-- .../common/item/equipment/bauble/ItemUnholyCloak.java | 5 +++-- .../equipment/tool/elementium/ItemElementiumShears.java | 7 ++++--- .../vazkii/botania/common/item/rod/ItemRainbowRod.java | 2 +- .../botania/data/recipes/ManaInfusionProvider.java | 1 + 30 files changed, 55 insertions(+), 40 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 034092b2e..2883cd4af 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -32,7 +32,8 @@ public final class SparkHelper { public static List getEntitiesAround(Class clazz, World world, double x, double y, double z) { int r = SPARK_SCAN_RANGE; - List entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r), Predicates.instanceOf(clazz)); + @SuppressWarnings("unchecked") + List entities = (List) (List) world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r), Predicates.instanceOf(clazz)); return entities; } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java index cf36320a0..139487c22 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java @@ -14,7 +14,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ArmorStandEntity; import net.minecraft.inventory.EquipmentSlotType; -public class ModelArmor extends BipedModel { +public class ModelArmor extends BipedModel { protected final EquipmentSlotType slot; public ModelArmor(EquipmentSlotType slot) { diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java index e742241ae..e514b7ed7 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java @@ -78,7 +78,7 @@ public class MultiCraftingProcessor implements IComponentProcessor { List ingredients = new ArrayList<>(); for (ICraftingRecipe recipe : recipes) { if (recipe instanceof IShapedRecipe) { - IShapedRecipe shaped = (IShapedRecipe) recipe; + IShapedRecipe shaped = (IShapedRecipe) recipe; if (shaped.getRecipeWidth() < shapedX + 1) { ingredients.add(Ingredient.EMPTY); } else { @@ -95,7 +95,7 @@ public class MultiCraftingProcessor implements IComponentProcessor { return PatchouliUtils.interweaveIngredients(ingredients, longestIngredientSize); } if (key.equals("output")) { - return recipes.stream().map(IRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); + return recipes.stream().map(ICraftingRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(",")); } if (key.equals("shapeless")) {} return null; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index b44d07314..a52e9d5ab 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -30,7 +30,7 @@ import javax.annotation.Nonnull; import java.util.Random; -public class RenderTileFloatingFlower extends TileEntityRenderer { +public class RenderTileFloatingFlower extends TileEntityRenderer { public RenderTileFloatingFlower(TileEntityRendererDispatcher manager) { super(manager); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 48e07c313..3b1c69429 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -102,8 +102,8 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { break; case EAST: axis = new AxisAlignedBB(x + 1, y - h, z - w, x + l + 1, y + h, z + w + 1); - default: break; + default: } return axis; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index bdb414e57..469d0b526 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -8,6 +8,7 @@ */ package vazkii.botania.common.block.subtile.functional; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.AvoidEntityGoal; import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; @@ -39,6 +40,7 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { } @Override + @SuppressWarnings("deprecated") public void tickFlower() { super.tickFlower(); @@ -80,6 +82,8 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { } } + // TODO replace this kludge + @SuppressWarnings({ "unchecked", "rawtypes" }) private boolean messWithRunAwayAI(AvoidEntityGoal aiEntry) { if (aiEntry.classToAvoid == OcelotEntity.class) { aiEntry.classToAvoid = PlayerEntity.class; @@ -88,6 +92,7 @@ public class SubTileTigerseye extends TileEntityFunctionalFlower { return false; } + @SuppressWarnings({ "unchecked", "rawtypes" }) private void messWithGetTargetAI(NearestAttackableTargetGoal aiEntry) { if (aiEntry.targetClass == PlayerEntity.class) { aiEntry.targetClass = EnderCrystalEntity.class; // Something random that won't be around diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index aacfc27f1..d3721c508 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -268,11 +268,12 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { } } + @SuppressWarnings("unchecked") public static Collection elvenTradeRecipes(RecipeManager rm) { // By virtue of IRecipeType's type parameter, // we know all the recipes in the map must be AbstractElvenTradeRecipe. // However, vanilla's signature on this method is dumb (should be Map) - return (Collection) rm.getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).values(); + return (Collection) (Collection) rm.getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).values(); } private void resolveRecipes() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 4fce66788..86a83200a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -65,7 +65,7 @@ public class TileSparkChanger extends TileSimpleInventory { ItemStack sparkStack = ItemSparkUpgrade.getByType(upg); SparkUpgradeType newUpg = changeStack.isEmpty() ? SparkUpgradeType.NONE : ((ItemSparkUpgrade) changeStack.getItem()).type; spark.setUpgrade(newUpg); - Collection transfers = spark.getTransfers(); + Collection transfers = spark.getTransfers(); if (transfers != null) { transfers.clear(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 3919b6b14..46a5f0be9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -468,9 +468,9 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public ISparkEntity getAttachedSpark() { - List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); + List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); if (sparks.size() == 1) { - Entity e = (Entity) sparks.get(0); + Entity e = sparks.get(0); return (ISparkEntity) e; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 321bd5ecc..4a8209b39 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -217,10 +217,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, double y = lastPingbackY; double z = lastPingbackZ; AxisAlignedBB aabb = new AxisAlignedBB(x, y, z, x, y, z).grow(PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE); - List bursts = world.getEntitiesWithinAABB(ThrowableEntity.class, aabb, Predicates.instanceOf(IManaBurst.class)); + @SuppressWarnings("unchecked") + List bursts = (List) (List) world.getEntitiesWithinAABB(ThrowableEntity.class, aabb, Predicates.instanceOf(IManaBurst.class)); IManaBurst found = null; UUID identity = getIdentifier(); - for (IManaBurst burst : (List) bursts) { + for (IManaBurst burst : bursts) { if (burst != null && identity.equals(burst.getShooterUUID())) { found = burst; break; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 86833523a..a976d96f0 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -709,7 +709,7 @@ public final class BotaniaCreativeTab extends ItemGroup { private void addTag(ResourceLocation tagId) { ItemTags.getCollection().getOrCreate(tagId).getAllElements().stream() - .sorted(Comparator.comparing(ForgeRegistryEntry::getRegistryName)) + .sorted(Comparator.comparing(ForgeRegistryEntry::getRegistryName)) .forEach(this::addItem); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java index 924abce00..b9937ec0a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java @@ -51,7 +51,7 @@ public class ExoflameFurnaceHandler { } public static boolean canSmelt(AbstractFurnaceTileEntity furnace, IRecipe recipe) throws Throwable { - return (boolean) CAN_SMELT.invokeExact((AbstractFurnaceTileEntity) furnace, recipe); + return (boolean) CAN_SMELT.invokeExact(furnace, recipe); } @SuppressWarnings("unchecked") diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index e0dcf21ab..7616afd4b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -30,6 +30,7 @@ public final class IMCHandler { } private static Map handleOreWeights(Stream msgs) { + @SuppressWarnings("unchecked") Map map = msgs .filter(msg -> { Object thing = msg.getMessageSupplier().get(); diff --git a/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java b/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java index 78ac4b3bb..d11c60156 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ExperienceHelper.java @@ -35,7 +35,7 @@ public class ExperienceHelper { } if (level > 0 && level < 17) { - return (int) (level * level + 6 * level); + return (level * level + 6 * level); } else if (level > 16 && level < 32) { return (int) (2.5 * level * level - 40.5 * level + 360); } else { diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index f5b144ab8..5f814acf7 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -52,7 +52,7 @@ public final class LootHandler { .build(); } - private static LootEntry.Builder getInjectEntry(String name, int weight) { + private static LootEntry.Builder getInjectEntry(String name, int weight) { ResourceLocation table = new ResourceLocation(LibMisc.MOD_ID, "inject/" + name); return TableLootEntry.builder(table) .weight(weight); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 6c4e6a144..c1365492b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -510,7 +510,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp private static int countGaiaGuardiansAround(World world, BlockPos source) { float range = 15F; - List l = world.getEntitiesWithinAABB(EntityDoppleganger.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); + List l = world.getEntitiesWithinAABB(EntityDoppleganger.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); return l.size(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index b6633a580..c549d6ba2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -191,14 +191,14 @@ public class EntityMagicMissile extends ThrowableEntity { double range = 12; AxisAlignedBB bounds = new AxisAlignedBB(getPosX() - range, getPosY() - range, getPosZ() - range, getPosX() + range, getPosY() + range, getPosZ() + range); - List entities; + List entities; if (isEvil()) { entities = world.getEntitiesWithinAABB(PlayerEntity.class, bounds); } else { entities = world.getEntitiesWithinAABB(Entity.class, bounds, Predicates.instanceOf(IMob.class)); } while (entities.size() > 0) { - Entity e = (Entity) entities.get(world.rand.nextInt(entities.size())); + Entity e = entities.get(world.rand.nextInt(entities.size())); if (!(e instanceof LivingEntity) || !e.isAlive()) { // Just in case... entities.remove(e); continue; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 3086f1ab8..ecdc33669 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -230,6 +230,7 @@ public class ItemTwigWand extends Item implements ICoordBoundItem { private static BlockState rotate(BlockState old, Direction.Axis axis) { for (IProperty prop : old.getProperties()) { if (prop.getName().equals("facing") && prop.getValueClass() == Direction.class) { + @SuppressWarnings("unchecked") IProperty facingProp = (IProperty) prop; Direction oldDir = old.get(facingProp); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 9f0b42fc5..5b4d0d7a0 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -184,10 +184,10 @@ public class ItemBrewBase extends Item implements IBrewItem { } if (d0 > 0.0D) { - lores.add((new TranslationTextComponent("attribute.modifier.plus." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + (String) tuple.getA()))).applyTextStyle(TextFormatting.BLUE)); + lores.add((new TranslationTextComponent("attribute.modifier.plus." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).applyTextStyle(TextFormatting.BLUE)); } else if (d0 < 0.0D) { d1 = d1 * -1.0D; - lores.add((new TranslationTextComponent("attribute.modifier.take." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + (String) tuple.getA()))).applyTextStyle(TextFormatting.RED)); + lores.add((new TranslationTextComponent("attribute.modifier.take." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).applyTextStyle(TextFormatting.RED)); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index ea6bbe1af..9e674ae12 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -36,7 +36,7 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor { @Override @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { return new ModelArmorElementium(slot); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index df94509cd..b32dc22e2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -51,7 +51,7 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh private static final String TAG_PHANTOM_INK = "phantomInk"; - private final LazyValue model; + private final LazyValue> model; public final EquipmentSlotType type; public ItemManasteelArmor(EquipmentSlotType type, Properties props) { @@ -96,16 +96,17 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh @Override @OnlyIn(Dist.CLIENT) - public BipedModel getArmorModel(LivingEntity entityLiving, ItemStack itemStack, EquipmentSlotType armorSlot, BipedModel original) { + @SuppressWarnings("unchecked") + public > A getArmorModel(LivingEntity entityLiving, ItemStack itemStack, EquipmentSlotType armorSlot, A original) { if (ConfigHandler.CLIENT.enableArmorModels.get()) { - return model.getValue(); + return (A) model.getValue(); } return super.getArmorModel(entityLiving, itemStack, armorSlot, original); } @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { return new ModelArmorManasteel(slot); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index b957190e3..f022b6cfc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -44,7 +44,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { @Override @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { return new ModelArmorManaweave(slot); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index f044e71d1..1a9f380b1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -43,7 +43,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override @OnlyIn(Dist.CLIENT) - public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { + public BipedModel provideArmorModelForSlot(EquipmentSlotType slot) { return new ModelArmorTerrasteel(slot); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 99b404bda..263ac2178 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -69,9 +69,10 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { if (ManaItemHandler.instance().requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(target.getPosX() - range, target.getPosY() - range, target.getPosZ() - range, target.getPosX() + range, target.getPosY() + range, target.getPosZ() + range), Predicates.instanceOf(IMob.class)); + @SuppressWarnings("unchecked") + List mobs = (List) (List) player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(target.getPosX() - range, target.getPosY() - range, target.getPosZ() - range, target.getPosX() + range, target.getPosY() + range, target.getPosZ() + range), Predicates.instanceOf(IMob.class)); if (mobs.size() > 1) { - if (SubTileHeiseiDream.brainwashEntity(target, (List) mobs)) { + if (SubTileHeiseiDream.brainwashEntity(target, mobs)) { target.heal(target.getMaxHealth()); target.revive(); if (target instanceof CreeperEntity) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 4dbfcefe1..44c170b0f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -31,7 +31,7 @@ import vazkii.botania.client.lib.LibResources; public class ItemKnockbackBelt extends ItemBauble { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_KNOCKBACK_BELT); - private static BipedModel model; + private static BipedModel model; public ItemKnockbackBelt(Properties props) { super(props); @@ -53,7 +53,7 @@ public class ItemKnockbackBelt extends ItemBauble { float s = 0.85F; ms.scale(s, s, s); if (model == null) { - model = new BipedModel(1.0F); + model = new BipedModel<>(1.0F); } IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(texture)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 371541e9f..e8d3a13c9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -39,7 +39,7 @@ import java.util.List; public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TRAVEL_BELT); - @OnlyIn(Dist.CLIENT) private static BipedModel model; + @OnlyIn(Dist.CLIENT) private static BipedModel model; private static final int COST = 1; private static final int COST_INTERVAL = 10; @@ -154,7 +154,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { float s = 0.85F; ms.scale(s, s, s); if (model == null) { - model = new BipedModel(1F); + model = new BipedModel<>(1F); } ResourceLocation texture = ((ItemTravelBelt) stack.getItem()).getRenderTexture(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 7f955fb3d..4f46f36bf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -42,8 +42,9 @@ public class ItemUnholyCloak extends ItemHolyCloak { public boolean effectOnDamage(LivingHurtEvent event, PlayerEntity player, ItemStack stack) { if (!event.getSource().isUnblockable()) { int range = 6; - List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.getPosX() - range, player.getPosY() - range, player.getPosZ() - range, player.getPosX() + range, player.getPosY() + range, player.getPosZ() + range), Predicates.instanceOf(IMob.class)); - for (IMob mob : (List) mobs) { + @SuppressWarnings("unchecked") + List mobs = (List) (List) player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.getPosX() - range, player.getPosY() - range, player.getPosZ() - range, player.getPosX() + range, player.getPosY() + range, player.getPosZ() + range), Predicates.instanceOf(IMob.class)); + for (IMob mob : mobs) { if (mob instanceof LivingEntity) { LivingEntity entity = (LivingEntity) mob; entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.getAmount()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index a3e795f33..4eb1e5a57 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -68,10 +68,11 @@ public class ItemElementiumShears extends ItemManasteelShears { if (count != getUseDuration(stack) && count % 5 == 0) { int range = 12; - List sheep = living.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.getPosX() - range, living.getPosY() - range, living.getPosZ() - range, living.getPosX() + range, living.getPosY() + range, living.getPosZ() + range), Predicates.instanceOf(IShearable.class)); + List sheep = living.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.getPosX() - range, living.getPosY() - range, living.getPosZ() - range, living.getPosX() + range, living.getPosY() + range, living.getPosZ() + range), Predicates.instanceOf(IShearable.class)); if (sheep.size() > 0) { - for (IShearable target : (List) sheep) { - Entity entity = (Entity) target; + for (Entity entity : sheep) { + @SuppressWarnings("unchecked") + IShearable target = (IShearable) entity; if (target.isShearable(stack, entity.world, new BlockPos(entity))) { List drops = target.onSheared(stack, entity.world, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack)); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index d92a49018..3fd59ad77 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -164,8 +164,8 @@ public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWield break; case EAST: axis = new AxisAlignedBB(tePos.add(1, -h, -w), tePos.add(l + 1, h, w + 1)); - default: break; + default: } List players = world.getEntitiesWithinAABB(PlayerEntity.class, axis); diff --git a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index 99ca9b489..ff7b88ed0 100644 --- a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -251,6 +251,7 @@ public class ManaInfusionProvider extends RecipeProvider { } } + @SuppressWarnings("unchecked") private static > String getName(IProperty prop, Comparable val) { return prop.getName((T) val); }