From 3213b776513b6e622fbd4e810a67c1ddaf17a41d Mon Sep 17 00:00:00 2001 From: nicksitnikov Date: Fri, 17 Apr 2026 23:09:31 -0500 Subject: [PATCH 1/2] Apply a whole ton of IntelliJ suggestions --- .../java/fox/spiteful/avaritia/Avaritia.java | 2 - .../fox/spiteful/avaritia/ClientProxy.java | 5 -- .../fox/spiteful/avaritia/CommonProxy.java | 4 -- .../fox/spiteful/avaritia/FieldHelper.java | 37 ----------- .../achievements/AchievementTrigger.java | 16 ++--- .../avaritia/achievements/Achievements.java | 2 +- .../avaritia/blocks/BlockCompressor.java | 3 +- .../blocks/BlockNeutronCollector.java | 3 +- .../avaritia/compat/CompatClient.java | 4 -- .../compat/bloodmagic/ItemOrbArmok.java | 2 +- .../avaritia/compat/forestry/Allele.java | 6 +- .../avaritia/compat/forestry/BeeBranch.java | 8 +-- .../compat/forestry/ExpensiveMutation.java | 14 ++-- .../compat/forestry/GreedyBeeSpecies.java | 6 +- .../compat/minetweaker/Compressor.java | 19 ++---- .../compat/minetweaker/ExtremeCrafting.java | 17 ++--- .../compat/nei/CompressionHandler.java | 23 +------ .../nei/ExtremeShapedRecipeHandler.java | 6 +- .../avaritia/compat/thaumcraft/Lucrum.java | 12 ++-- .../avaritia/compat/ticon/TonkersEvents.java | 14 ++-- .../crafting/ExtremeCraftingManager.java | 3 +- .../crafting/ExtremeShapedOreRecipe.java | 4 +- .../spiteful/avaritia/crafting/Mincer.java | 66 +++++++------------ .../avaritia/entity/EntityImmortalItem.java | 5 +- .../avaritia/gui/ContainerCompressor.java | 4 +- .../gui/ContainerExtremeCrafting.java | 4 +- .../avaritia/gui/ContainerNeutron.java | 4 +- .../avaritia/items/ItemStackWrapper.java | 4 +- .../avaritia/items/tools/ItemBowInfinity.java | 5 -- .../items/tools/ItemSwordInfinity.java | 6 +- .../avaritia/items/tools/ToolHelper.java | 6 +- .../avaritia/render/FancyHaloRenderer.java | 12 +--- .../avaritia/render/ModelArmorInfinity.java | 27 ++++---- .../avaritia/render/RenderHeavenArrow.java | 24 +++---- 34 files changed, 124 insertions(+), 253 deletions(-) delete mode 100644 src/main/java/fox/spiteful/avaritia/FieldHelper.java diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 6d1d35c2..97fbad81 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -60,9 +60,7 @@ public void earlyGame(FMLPreInitializationEvent event) { LudicrousBlocks.voxelize(); Compat.census(); if (Config.craftingOnly) return; - LudicrousEntities.letLooseTheDogsOfWar(); - proxy.prepareForPretty(); } @EventHandler diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index 82892790..f62d03fe 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -24,11 +24,6 @@ public class ClientProxy extends CommonProxy { public static final double toDeg = (1.0 / (Math.PI * 2)) * 360.0; - @Override - public void prepareForPretty() { - CompatClient.earlyComprettify(); - } - @Override public void makeThingsPretty() { FancyHaloRenderer shiny = new FancyHaloRenderer(); diff --git a/src/main/java/fox/spiteful/avaritia/CommonProxy.java b/src/main/java/fox/spiteful/avaritia/CommonProxy.java index ff3339c3..dbbd4407 100644 --- a/src/main/java/fox/spiteful/avaritia/CommonProxy.java +++ b/src/main/java/fox/spiteful/avaritia/CommonProxy.java @@ -2,10 +2,6 @@ public class CommonProxy { - public void prepareForPretty() { - - } - public void makeThingsPretty() { } diff --git a/src/main/java/fox/spiteful/avaritia/FieldHelper.java b/src/main/java/fox/spiteful/avaritia/FieldHelper.java deleted file mode 100644 index 40f1f717..00000000 --- a/src/main/java/fox/spiteful/avaritia/FieldHelper.java +++ /dev/null @@ -1,37 +0,0 @@ -package fox.spiteful.avaritia; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import org.apache.logging.log4j.Level; - -public class FieldHelper { - - @SuppressWarnings("unchecked") - public static T get(Field field, Object instance) { - try { - return (T) field.get(instance); - } catch (Exception e) { - Lumberjack.log(Level.ERROR, e); - } - return null; - } - - public static void set(Field field, Object instance, T value) { - try { - field.set(instance, value); - } catch (Exception e) { - Lumberjack.log(Level.ERROR, e); - } - } - - @SuppressWarnings("unchecked") - public static T invoke(Method method, Object instance, Object... params) { - try { - return (T) method.invoke(instance, params); - } catch (Exception e) { - Lumberjack.log(Level.ERROR, e); - } - return null; - } -} diff --git a/src/main/java/fox/spiteful/avaritia/achievements/AchievementTrigger.java b/src/main/java/fox/spiteful/avaritia/achievements/AchievementTrigger.java index cc6a5569..2164a372 100644 --- a/src/main/java/fox/spiteful/avaritia/achievements/AchievementTrigger.java +++ b/src/main/java/fox/spiteful/avaritia/achievements/AchievementTrigger.java @@ -18,18 +18,18 @@ public void onItemCrafted(PlayerEvent.ItemCraftedEvent event) { if (event.crafting.getItem() == LudicrousItems.resource) { switch (event.crafting.getItemDamage()) { - case 1: + case 1 -> { event.player.addStat(Achievements.crystal_matrix, 1); - return; - case 4: + } + case 4 -> { event.player.addStat(Achievements.neutronium, 1); - return; - case 5: + } + case 5 -> { event.player.addStat(Achievements.catalyst, 1); - return; - case 6: + } + case 6 -> { event.player.addStat(Achievements.infinity, 1); - return; + } } } else if (event.crafting.getItem() == Item.getItemFromBlock(LudicrousBlocks.dire_crafting)) { event.player.addStat(Achievements.dire_crafting, 1); diff --git a/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java b/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java index a3a250ea..1dbd28d2 100644 --- a/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java +++ b/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java @@ -79,7 +79,7 @@ public static void achieve() { page = new AchievementPage( "Avaritia", - LudicrousAchievement.achievements.toArray(new Achievement[LudicrousAchievement.achievements.size()])); + LudicrousAchievement.achievements.toArray(new Achievement[0])); AchievementPage.registerAchievementPage(page); AchievementTrigger tigger = new AchievementTrigger(); diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockCompressor.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockCompressor.java index cc47a0ee..bd1940c3 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockCompressor.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockCompressor.java @@ -77,8 +77,7 @@ public TileEntity createNewTileEntity(World world, int meta) { @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack item) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityCompressor) { - TileEntityCompressor machine = (TileEntityCompressor) tile; + if (tile instanceof TileEntityCompressor machine) { int l = MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; if (l == 0) machine.setFacing(2); diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java index ac64a3be..47bce67d 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java @@ -77,8 +77,7 @@ public TileEntity createNewTileEntity(World world, int meta) { @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack item) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityNeutron) { - TileEntityNeutron machine = (TileEntityNeutron) tile; + if (tile instanceof TileEntityNeutron machine) { int l = MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; if (l == 0) machine.setFacing(2); diff --git a/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java b/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java index fb3412f3..1f1d1a1b 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java +++ b/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java @@ -14,10 +14,6 @@ public class CompatClient { - public static void earlyComprettify() { - - } - public static void comprettify() { if (Compat.botan) { RenderingRegistry.registerBlockHandler(new RenderInfinitato(RenderingRegistry.getNextAvailableRenderId())); diff --git a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java index 13f006d7..1d84c5db 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java +++ b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java @@ -39,7 +39,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { if (!world.isRemote && entity instanceof EntityPlayer) { NBTTagCompound itemTag = stack.stackTagCompound; - if (itemTag == null || itemTag.getString("ownerName").equals("")) return; + if (itemTag == null || itemTag.getString("ownerName").isEmpty()) return; SoulNetworkHandler .addCurrentEssenceToMaximum(itemTag.getString("ownerName"), Integer.MAX_VALUE, getMaxEssence()); diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java index 1c611f59..fd821f06 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java @@ -49,17 +49,17 @@ public boolean isDominant() { public static IAlleleBeeSpecies getBaseSpecies(String name) { return (IAlleleBeeSpecies) AlleleManager.alleleRegistry - .getAllele((new StringBuilder()).append("forestry.species").append(name).toString()); + .getAllele("forestry.species" + name); } public static IAlleleBeeSpecies getExtraSpecies(String name) { return (IAlleleBeeSpecies) AlleleManager.alleleRegistry - .getAllele((new StringBuilder()).append("extrabees.species.").append(name.toLowerCase()).toString()); + .getAllele("extrabees.species." + name.toLowerCase()); } public static IAlleleBeeSpecies getMagicSpecies(String name) { return (IAlleleBeeSpecies) AlleleManager.alleleRegistry - .getAllele((new StringBuilder()).append("magicbees.species").append(name).toString()); + .getAllele("magicbees.species" + name); } public static IAllele getBaseAllele(String name) { diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/BeeBranch.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/BeeBranch.java index ce0608b0..e368a343 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/BeeBranch.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/BeeBranch.java @@ -13,9 +13,9 @@ public enum BeeBranch implements IClassification { BALANCED("balanced", "Molestus"), INFINITE("infinite", "Infinitus"); - private String name; - private String latin; - private ArrayList species = new ArrayList(); + private final String name; + private final String latin; + private final ArrayList species = new ArrayList<>(); private IClassification parent; private final EnumClassLevel level = EnumClassLevel.GENUS; @@ -63,7 +63,7 @@ public void addMemberGroup(IClassification group) { @Override public IAlleleSpecies[] getMemberSpecies() { - return this.species.toArray(new IAlleleSpecies[this.species.size()]); + return this.species.toArray(new IAlleleSpecies[0]); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java index 98587ba0..d0bf0565 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -15,11 +16,10 @@ public class ExpensiveMutation implements IBeeMutation { - private IAlleleBeeSpecies mom; - private IAlleleBeeSpecies dad; - private IAllele[] template; - private boolean secret = false; - private float baseChance; + private final IAlleleBeeSpecies mom; + private final IAlleleBeeSpecies dad; + private final IAllele[] template; + private final float baseChance; public ExpensiveMutation(IAlleleBeeSpecies first, IAlleleBeeSpecies second, IAllele[] result, float chance) { mom = first; @@ -88,7 +88,7 @@ public float getBaseChance() { @Override public boolean isSecret() { - return secret; + return false; } @Override @@ -104,7 +104,7 @@ public IAllele getPartner(IAllele allele) { @Override public Collection getSpecialConditions() { - return new ArrayList(); + return Collections.emptyList(); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/GreedyBeeSpecies.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/GreedyBeeSpecies.java index ecfab452..959d1de4 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/GreedyBeeSpecies.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/GreedyBeeSpecies.java @@ -243,7 +243,7 @@ private int getGeneticAdvancement(IAllele species, ArrayList exclude) { } } } - return own + (highest < 0 ? 0 : highest); + return own + highest; } @Override @@ -291,7 +291,7 @@ public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndiv if (world.rand.nextFloat() < ((10f / bountyLevel))) { Collection resultantMutations = getRoot().getCombinations(this); if (resultantMutations.size() > 0) { - IMutation[] candidates = resultantMutations.toArray(new IMutation[resultantMutations.size()]); + IMutation[] candidates = resultantMutations.toArray(new IMutation[0]); bounty.add( AlleleManager.alleleRegistry .getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)])); @@ -312,7 +312,7 @@ public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndiv } } - return bounty.toArray(new ItemStack[bounty.size()]); + return bounty.toArray(new ItemStack[0]); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/compat/minetweaker/Compressor.java b/src/main/java/fox/spiteful/avaritia/compat/minetweaker/Compressor.java index 1b7bda52..bf6d69c5 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/minetweaker/Compressor.java +++ b/src/main/java/fox/spiteful/avaritia/compat/minetweaker/Compressor.java @@ -46,7 +46,6 @@ public Add(CompressorRecipe add) { @Override public void apply() { - CompressorManager.getRecipes().add(recipe); } @@ -88,15 +87,11 @@ public Remove(ItemStack rem) { @Override public void apply() { - - for (Object obj : CompressorManager.getRecipes()) { - if (obj instanceof CompressorRecipe) { - CompressorRecipe craft = (CompressorRecipe) obj; - if (craft.getOutput().isItemEqual(remove)) { - recipe = craft; - CompressorManager.getRecipes().remove(obj); - break; - } + for (CompressorRecipe obj : CompressorManager.getRecipes()) { + if (obj.getOutput().isItemEqual(remove)) { + recipe = obj; + CompressorManager.getRecipes().remove(obj); + break; } } } @@ -132,7 +127,7 @@ private static ItemStack toStack(IItemStack item) { if (item == null) return null; else { Object internal = item.getInternal(); - if (internal == null || !(internal instanceof ItemStack)) { + if (!(internal instanceof ItemStack)) { MineTweakerAPI.getLogger().logError("Not a valid item stack: " + item); } return (ItemStack) internal; @@ -140,6 +135,6 @@ private static ItemStack toStack(IItemStack item) { } private static String toString(IOreDictEntry entry) { - return ((IOreDictEntry) entry).getName(); + return entry.getName(); } } diff --git a/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java b/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java index d0711c8b..904b627f 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java @@ -100,14 +100,11 @@ public Remove(ItemStack rem) { @Override public void apply() { - for (Object obj : ExtremeCraftingManager.getInstance().getRecipeList()) { - if (obj instanceof IRecipe) { - IRecipe craft = (IRecipe) obj; - if (craft.getRecipeOutput().isItemEqual(remove)) { - recipe = craft; - ExtremeCraftingManager.getInstance().getRecipeList().remove(obj); - break; - } + for (IRecipe craft : ExtremeCraftingManager.getInstance().getRecipeList()) { + if (craft.getRecipeOutput().isItemEqual(remove)) { + recipe = craft; + ExtremeCraftingManager.getInstance().getRecipeList().remove(craft); + break; } } } @@ -143,7 +140,7 @@ private static ItemStack toStack(IItemStack item) { if (item == null) return null; else { Object internal = item.getInternal(); - if (internal == null || !(internal instanceof ItemStack)) { + if (!(internal instanceof ItemStack)) { MineTweakerAPI.getLogger().logError("Not a valid item stack: " + item); } return (ItemStack) internal; @@ -182,7 +179,7 @@ private static Object toActualObject(IIngredient ingredient) { } private static String toString(IOreDictEntry entry) { - return ((IOreDictEntry) entry).getName(); + return entry.getName(); } } diff --git a/src/main/java/fox/spiteful/avaritia/compat/nei/CompressionHandler.java b/src/main/java/fox/spiteful/avaritia/compat/nei/CompressionHandler.java index 944bc98f..571cb2f2 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/nei/CompressionHandler.java +++ b/src/main/java/fox/spiteful/avaritia/compat/nei/CompressionHandler.java @@ -5,8 +5,6 @@ import java.util.Arrays; import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -14,8 +12,6 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.crafting.CompressOreRecipe; import fox.spiteful.avaritia.crafting.CompressorManager; import fox.spiteful.avaritia.crafting.CompressorRecipe; @@ -23,20 +19,11 @@ public class CompressionHandler extends TemplateRecipeHandler { - @SideOnly(Side.CLIENT) - private FontRenderer fontRender; - - @SideOnly(Side.CLIENT) - public CompressionHandler() { - super(); - fontRender = Minecraft.getMinecraft().fontRenderer; - } - public class CachedCompression extends CachedRecipe { - private PositionedStack ingred; - private PositionedStack result; - private int cost; + private final PositionedStack ingred; + private final PositionedStack result; + private final int cost; public CachedCompression(CompressorRecipe recipe) { this(recipe.getOutput(), recipe.getCost(), recipe.getIngredient()); @@ -64,10 +51,6 @@ public void computeVisuals() { this.ingred.generatePermutations(); } - public int getCost() { - return cost; - } - } @Override diff --git a/src/main/java/fox/spiteful/avaritia/compat/nei/ExtremeShapedRecipeHandler.java b/src/main/java/fox/spiteful/avaritia/compat/nei/ExtremeShapedRecipeHandler.java index 08cb51b9..e725ea80 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/nei/ExtremeShapedRecipeHandler.java +++ b/src/main/java/fox/spiteful/avaritia/compat/nei/ExtremeShapedRecipeHandler.java @@ -87,7 +87,7 @@ public String getRecipeName() { @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals("extreme") && getClass() == ExtremeShapedRecipeHandler.class) { - for (IRecipe irecipe : (List) ExtremeCraftingManager.getInstance().getRecipeList()) { + for (IRecipe irecipe : ExtremeCraftingManager.getInstance().getRecipeList()) { CachedExtremeRecipe recipe = null; if (irecipe instanceof ExtremeShapedRecipe) recipe = new CachedExtremeRecipe((ExtremeShapedRecipe) irecipe); @@ -106,7 +106,7 @@ else if (irecipe instanceof ExtremeShapedOreRecipe) @Override public void loadCraftingRecipes(ItemStack result) { - for (IRecipe irecipe : (List) ExtremeCraftingManager.getInstance().getRecipeList()) { + for (IRecipe irecipe : ExtremeCraftingManager.getInstance().getRecipeList()) { if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(irecipe.getRecipeOutput(), result)) { CachedExtremeRecipe recipe = null; if (irecipe instanceof ExtremeShapedRecipe) @@ -124,7 +124,7 @@ else if (irecipe instanceof ExtremeShapedOreRecipe) @Override public void loadUsageRecipes(ItemStack ingredient) { - for (IRecipe irecipe : (List) ExtremeCraftingManager.getInstance().getRecipeList()) { + for (IRecipe irecipe : ExtremeCraftingManager.getInstance().getRecipeList()) { CachedExtremeRecipe recipe = null; if (irecipe instanceof ExtremeShapedRecipe) recipe = new CachedExtremeRecipe((ExtremeShapedRecipe) irecipe); else if (irecipe instanceof ExtremeShapedOreRecipe) diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java index 1193c2a8..63d763de 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java @@ -158,9 +158,9 @@ public static void abracadabra() throws Compat.ItemNotFoundException { 5, new ItemStack(LudicrousItems.bigPearl))) .setPages( - new ResearchPage[] { new ResearchPage("avaritia.research_page.BIG_PEARL.1"), - new ResearchPage(pearl_recipe) }) - .setParents(new String[] { "PRIMPEARL" }).setConcealed().setSecondary().registerResearchItem(); + new ResearchPage("avaritia.research_page.BIG_PEARL.1"), + new ResearchPage(pearl_recipe)) + .setParents("PRIMPEARL").setConcealed().setSecondary().registerResearchItem(); InfusionRecipe akashic_recipe = ThaumcraftApi.addInfusionCraftingRecipe( "AKASHIC", @@ -180,9 +180,9 @@ public static void abracadabra() throws Compat.ItemNotFoundException { 5, new ItemStack(LudicrousItems.akashic_record))) .setPages( - new ResearchPage[] { new ResearchPage("avaritia.research_page.AKASHIC.1"), - new ResearchPage(akashic_recipe) }) - .setParents(new String[] { "BIG_PEARL" }).setConcealed().setSecondary().registerResearchItem(); + new ResearchPage("avaritia.research_page.AKASHIC.1"), + new ResearchPage(akashic_recipe)) + .setParents("BIG_PEARL").setConcealed().setSecondary().registerResearchItem(); } diff --git a/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java b/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java index 47fe30f1..83fda634 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java +++ b/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java @@ -47,8 +47,7 @@ public void handleExtraLuck(HarvestDropsEvent event) { if (event.harvester == null) return; if (event.harvester.getHeldItem() == null) return; ItemStack held = event.harvester.getHeldItem(); - if (held != null && held.hasTagCompound() && held.getItem() instanceof ToolCore) { - ToolCore tool = (ToolCore) held.getItem(); + if (held != null && held.hasTagCompound() && held.getItem() instanceof ToolCore tool) { NBTTagCompound toolTag = held.getTagCompound().getCompoundTag("InfiTool"); if (toolTag.getInteger("Head") == Tonkers.infinityMetalId) { @@ -80,13 +79,9 @@ public void handleExtraLuck(HarvestDropsEvent event) { public void onHurt(LivingHurtEvent event) { Entity damaged = event.entity; Entity damager = event.source.getSourceOfDamage(); - if (damager != null && damager instanceof EntityLivingBase && damaged instanceof EntityLivingBase) { - EntityLivingBase attacker = (EntityLivingBase) damager; - EntityLivingBase attacked = (EntityLivingBase) damaged; - + if (damager instanceof EntityLivingBase attacker && damaged instanceof EntityLivingBase attacked) { ItemStack held = attacker.getHeldItem(); - if (held != null && held.hasTagCompound() && held.getItem() instanceof ToolCore) { - ToolCore tool = (ToolCore) held.getItem(); + if (held != null && held.hasTagCompound() && held.getItem() instanceof ToolCore tool) { NBTTagCompound toolTag = held.getTagCompound().getCompoundTag("InfiTool"); float puntpower = 0.0f; @@ -130,11 +125,10 @@ public void onPlayerMine(PlayerInteractEvent event) { ItemStack held = event.entityPlayer.getHeldItem(); if (block.getBlockHardness(event.entityPlayer.worldObj, event.x, event.y, event.z) <= -1 && held.hasTagCompound() - && held.getItem() instanceof ToolCore + && held.getItem() instanceof ToolCore tool && (block.getMaterial() == Material.rock || block.getMaterial() == Material.iron)) { NBTTagCompound toolTag = held.getTagCompound().getCompoundTag("InfiTool"); - ToolCore tool = (ToolCore) held.getItem(); if (toolTag != null && toolTag.getInteger("Head") == Tonkers.infinityMetalId && tool.canHarvestBlock(Blocks.stone, held)) { diff --git a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java index 68ba9eb9..97412fd0 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java @@ -133,11 +133,10 @@ public void addOreSingularityRecipe(ItemStack result, String ore) { public ExtremeShapelessRecipe addShapelessRecipe(ItemStack result, Object... ingredients) { List arraylist = new ArrayList<>(); - Object[] aobject = ingredients; int i = ingredients.length; for (int j = 0; j < i; ++j) { - Object object1 = aobject[j]; + Object object1 = ingredients[j]; if (object1 instanceof ItemStack stack) { arraylist.add(stack.copy()); diff --git a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java index c8332b56..83d87f04 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java @@ -77,7 +77,7 @@ public ExtremeShapedOreRecipe(ItemStack result, Object... recipe) { throw new RuntimeException(ret); } - HashMap itemMap = new HashMap(); + HashMap itemMap = new HashMap<>(); for (; idx < recipe.length; idx += 2) { Character chr = (Character) recipe[idx]; @@ -241,7 +241,7 @@ public ExtremeShapedOreRecipe setMirrored(boolean mirror) { /** * Returns the input for this recipe, any mod accessing this value should never manipulate the values in this array * as it will effect the recipe itself. - * + * * @return The recipes input vales. */ public Object[] getInput() { diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java index 07fa8f4f..ef820550 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java @@ -124,16 +124,12 @@ public static void countThoseCalories() { // Lumberjack.info("pre-sort: "+cropSortingList); // sort into size/alphabetic order first to standardise them - Collections.sort(cropSortingList, new Comparator() { - - @Override - public int compare(FoodInfo a, FoodInfo b) { - if (a.count != b.count) { - return b.count > a.count ? 1 : -1; - } - - return a.orename.compareTo(b.orename); + cropSortingList.sort((a, b) -> { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; } + + return a.orename.compareTo(b.orename); }); // Lumberjack.info("first sort: "+cropSortingList); @@ -141,16 +137,12 @@ public int compare(FoodInfo a, FoodInfo b) { // sort into size/random order, should be deterministic because previous sort Collections.shuffle(cropSortingList, randy); - Collections.sort(cropSortingList, new Comparator() { - - @Override - public int compare(FoodInfo a, FoodInfo b) { - if (a.count != b.count) { - return b.count > a.count ? 1 : -1; - } - - return 0; + cropSortingList.sort((a, b) -> { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; } + + return 0; }); // Lumberjack.info("second sort: "+cropSortingList); @@ -221,14 +213,14 @@ public int compare(FoodInfo a, FoodInfo b) { Item meef = Compat.getItem("TwilightForest", "item.meefRaw"); knownMeats.add(new ItemStack(venison)); knownMeats.add(new ItemStack(meef)); - } catch (Exception e) {} + } catch (Exception ignored) {} } if (Loader.isModLoaded("Natura")) { try { Item imp = Compat.getItem("Natura", "impmeat"); knownMeats.add(new ItemStack(imp)); - } catch (Exception e) {} + } catch (Exception ignored) {} } if (Compat.am2) { @@ -244,37 +236,23 @@ public int compare(FoodInfo a, FoodInfo b) { Lumberjack.info("rawMeats: " + rawMeats); Lumberjack.info("knownMeats: " + knownMeats); - // Lumberjack.info("pre-sort: "+meatSortingList); - // sort into size/alphabetic order first to standardise them - Collections.sort(meatSortingList, new Comparator() { - - @Override - public int compare(FoodInfo a, FoodInfo b) { - if (a.count != b.count) { - return b.count > a.count ? 1 : -1; - } - - return a.orename.compareTo(b.orename); + meatSortingList.sort((a, b) -> { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; } - }); - // Lumberjack.info("first sort: "+meatSortingList); + return a.orename.compareTo(b.orename); + }); // sort into size/random order, should be deterministic because previous sort - Collections.sort(meatSortingList, new Comparator() { - - @Override - public int compare(FoodInfo a, FoodInfo b) { - if (a.count != b.count) { - return b.count > a.count ? 1 : -1; - } - - return randy.nextBoolean() ? 1 : -1; + meatSortingList.sort((a, b) -> { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; } - }); - // Lumberjack.info("second sort: "+meatSortingList); + return randy.nextBoolean() ? 1 : -1; + }); // CULL! diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityImmortalItem.java b/src/main/java/fox/spiteful/avaritia/entity/EntityImmortalItem.java index df922481..c5f9a240 100644 --- a/src/main/java/fox/spiteful/avaritia/entity/EntityImmortalItem.java +++ b/src/main/java/fox/spiteful/avaritia/entity/EntityImmortalItem.java @@ -41,10 +41,7 @@ protected void dealFireDamage(int damage) {} @Override public boolean attackEntityFrom(DamageSource source, float damage) { - if (source.getDamageType().equals("outOfWorld")) { - return true; - } - return false; + return source.getDamageType().equals("outOfWorld"); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/gui/ContainerCompressor.java b/src/main/java/fox/spiteful/avaritia/gui/ContainerCompressor.java index 1cebb1fc..e4dc566d 100644 --- a/src/main/java/fox/spiteful/avaritia/gui/ContainerCompressor.java +++ b/src/main/java/fox/spiteful/avaritia/gui/ContainerCompressor.java @@ -42,7 +42,7 @@ public boolean canInteractWith(EntityPlayer player) { @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { ItemStack itemstack = null; - Slot slot = (Slot) this.inventorySlots.get(slotNumber); + Slot slot = this.inventorySlots.get(slotNumber); if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); @@ -71,7 +71,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { } if (itemstack1.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java b/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java index 1488f77d..1bd69260 100644 --- a/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/gui/ContainerExtremeCrafting.java @@ -89,7 +89,7 @@ public boolean canInteractWith(EntityPlayer player) { @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { ItemStack itemstack = null; - Slot slot = (Slot) this.inventorySlots.get(slotNumber); + Slot slot = this.inventorySlots.get(slotNumber); if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); @@ -114,7 +114,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { } if (itemstack1.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java b/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java index 86ad8b27..ba54adb1 100644 --- a/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java +++ b/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java @@ -40,7 +40,7 @@ public boolean canInteractWith(EntityPlayer player) { @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { ItemStack itemstack = null; - Slot slot = (Slot) this.inventorySlots.get(slotNumber); + Slot slot = this.inventorySlots.get(slotNumber); if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); @@ -63,7 +63,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { } if (itemstack1.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemStackWrapper.java b/src/main/java/fox/spiteful/avaritia/items/ItemStackWrapper.java index 3c91896e..2c891f7c 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemStackWrapper.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemStackWrapper.java @@ -12,9 +12,7 @@ public ItemStackWrapper(ItemStack stack) { @Override public boolean equals(Object otherobj) { - if (otherobj instanceof ItemStackWrapper) { - ItemStackWrapper other = (ItemStackWrapper) otherobj; - + if (otherobj instanceof ItemStackWrapper other) { if (this.stack.getItem().equals(other.stack.getItem()) && this.stack.getItemDamage() == other.stack.getItemDamage()) { diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemBowInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemBowInfinity.java index d34f96db..f572baca 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemBowInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemBowInfinity.java @@ -115,11 +115,6 @@ public void fire(ItemStack stack, World world, EntityPlayer player, int useCount } } - @Override - public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { - return stack; - } - @Override public int getMaxItemUseDuration(ItemStack stack) { return 13; diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java index c0e422aa..6f39b65d 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java @@ -39,8 +39,7 @@ public ItemSwordInfinity() { @Override public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase player) { if (player.worldObj.isRemote) return true; - if (victim instanceof EntityPlayer) { - EntityPlayer pvp = (EntityPlayer) victim; + if (victim instanceof EntityPlayer pvp) { if (LudicrousItems.isInfinite(pvp)) { if (Belmont.isVampire(pvp)) victim.attackEntityFrom( new DamageSourceInfinitySword(player).setFireDamage().setDamageBypassesArmor(), @@ -64,8 +63,7 @@ public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingB @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - if (!entity.worldObj.isRemote && entity instanceof EntityPlayer) { - EntityPlayer victim = (EntityPlayer) entity; + if (!entity.worldObj.isRemote && entity instanceof EntityPlayer victim) { if (victim.capabilities.isCreativeMode && !victim.isDead && victim.getHealth() > 0 && !LudicrousItems.isInfinite(victim)) { diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ToolHelper.java b/src/main/java/fox/spiteful/avaritia/items/tools/ToolHelper.java index ac4e44a3..717f30d2 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ToolHelper.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ToolHelper.java @@ -41,8 +41,8 @@ public class ToolHelper { public static Material[] materialsAxe = new Material[] { Material.coral, Material.leaves, Material.plants, Material.wood, Material.vine }; - public static Set hammering = new HashSet<>(); - public static Map> hammerdrops = new WeakHashMap<>(); + public static final Set hammering = new HashSet<>(); + public static final Map> hammerdrops = new WeakHashMap<>(); public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int xs, int ys, int zs, int xe, int ye, int ze, Block block, Material[] materialsListing, boolean silk, @@ -195,7 +195,7 @@ public static List collateMatterClusterContents(Map Date: Fri, 17 Apr 2026 23:10:17 -0500 Subject: [PATCH 2/2] Apply spotless --- .../fox/spiteful/avaritia/achievements/Achievements.java | 4 +--- .../fox/spiteful/avaritia/compat/forestry/Allele.java | 9 +++------ .../avaritia/compat/forestry/ExpensiveMutation.java | 1 - .../fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java | 8 ++++---- src/main/java/fox/spiteful/avaritia/crafting/Mincer.java | 1 - .../fox/spiteful/avaritia/render/FancyHaloRenderer.java | 1 - 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java b/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java index 1dbd28d2..ccd389a1 100644 --- a/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java +++ b/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java @@ -77,9 +77,7 @@ public static void achieve() { if (Compat.blood) armok = new LudicrousAchievement("armok", 2, -5, LudicrousItems.armok_orb, infinity); - page = new AchievementPage( - "Avaritia", - LudicrousAchievement.achievements.toArray(new Achievement[0])); + page = new AchievementPage("Avaritia", LudicrousAchievement.achievements.toArray(new Achievement[0])); AchievementPage.registerAchievementPage(page); AchievementTrigger tigger = new AchievementTrigger(); diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java index fd821f06..f1a61fd8 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/Allele.java @@ -48,18 +48,15 @@ public boolean isDominant() { } public static IAlleleBeeSpecies getBaseSpecies(String name) { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry - .getAllele("forestry.species" + name); + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.species" + name); } public static IAlleleBeeSpecies getExtraSpecies(String name) { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry - .getAllele("extrabees.species." + name.toLowerCase()); + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("extrabees.species." + name.toLowerCase()); } public static IAlleleBeeSpecies getMagicSpecies(String name) { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry - .getAllele("magicbees.species" + name); + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("magicbees.species" + name); } public static IAllele getBaseAllele(String name) { diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java index d0bf0565..98a81c2f 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/ExpensiveMutation.java @@ -1,6 +1,5 @@ package fox.spiteful.avaritia.compat.forestry; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java index 63d763de..e30308b6 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java @@ -158,8 +158,8 @@ public static void abracadabra() throws Compat.ItemNotFoundException { 5, new ItemStack(LudicrousItems.bigPearl))) .setPages( - new ResearchPage("avaritia.research_page.BIG_PEARL.1"), - new ResearchPage(pearl_recipe)) + new ResearchPage("avaritia.research_page.BIG_PEARL.1"), + new ResearchPage(pearl_recipe)) .setParents("PRIMPEARL").setConcealed().setSecondary().registerResearchItem(); InfusionRecipe akashic_recipe = ThaumcraftApi.addInfusionCraftingRecipe( @@ -180,8 +180,8 @@ public static void abracadabra() throws Compat.ItemNotFoundException { 5, new ItemStack(LudicrousItems.akashic_record))) .setPages( - new ResearchPage("avaritia.research_page.AKASHIC.1"), - new ResearchPage(akashic_recipe)) + new ResearchPage("avaritia.research_page.AKASHIC.1"), + new ResearchPage(akashic_recipe)) .setParents("BIG_PEARL").setConcealed().setSecondary().registerResearchItem(); } diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java index ef820550..1acee4ea 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.Random; diff --git a/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java index 5ca0e079..dda1e7fd 100644 --- a/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java @@ -1,6 +1,5 @@ package fox.spiteful.avaritia.render; -import java.util.Objects; import java.util.Random; import net.minecraft.client.Minecraft;