diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 294dbba87..2ceb01551 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -115,11 +115,11 @@ public final class BotaniaAPI { public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); - public static KnowledgeType basicKnowledge; - public static KnowledgeType elvenKnowledge; + public static final KnowledgeType basicKnowledge; + public static final KnowledgeType elvenKnowledge; // This is here for completeness sake, but you shouldn't use it - public static KnowledgeType relicKnowledge; + public static final KnowledgeType relicKnowledge; // All of these categories are initialized during botania's PreInit stage. public static LexiconCategory categoryBasics; @@ -133,7 +133,7 @@ public final class BotaniaAPI { public static LexiconCategory categoryAlfhomancy; public static LexiconCategory categoryMisc; - public static Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); + public static final Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); static { registerSubTile("", DummySubTile.class); diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 431b21bdf..4e3dfb1dd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -10,7 +10,9 @@ */ package vazkii.botania.client.core.handler; +import java.io.IOException; import java.io.InputStreamReader; +import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -199,11 +201,12 @@ public final class ContributorFancinessHandler implements LayerRenderer boltlist = new ConcurrentLinkedQueue<>(); + public static final ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); public float speed = 1.5F; public static final int fadetime = 20; @@ -205,7 +205,7 @@ public class LightningHandler { public int colorOuter; public int colorInner; - public class BoltPoint { + public static class BoltPoint { public BoltPoint(Vector3 basepoint, Vector3 offsetvec) { point = basepoint.copy().add(offsetvec); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 414b44484..529833325 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -20,6 +20,7 @@ import java.util.Calendar; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Queue; import net.minecraft.client.Minecraft; @@ -73,7 +74,7 @@ public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); public static ItemStack stackUsed; - public static HashMap notes = new HashMap<>(); + public static final Map notes = new HashMap<>(); private static final String TAG_TYPE = "type"; @@ -82,11 +83,11 @@ public class GuiLexicon extends GuiScreen { public static final int BOOKMARK_START = 1337; public static final int NOTES_BUTTON_ID = 1336; // random button tho public static final int MAX_BOOKMARK_COUNT = 8; - public static List bookmarks = new ArrayList<>(); - public static List bookmarkKeys = new ArrayList<>(); - boolean bookmarksNeedPopulation = false; + public static final List bookmarks = new ArrayList<>(); + public static final List bookmarkKeys = new ArrayList<>(); + private boolean bookmarksNeedPopulation = false; - public static Queue tutorial = new ArrayDeque<>(); + public static final Queue tutorial = new ArrayDeque<>(); public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON); public static final ResourceLocation textureToff = new ResourceLocation(LibResources.GUI_TOFF); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index 5e72ae706..f0e4ce30a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -20,7 +20,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; public class GuiLexiconHistory extends GuiLexiconIndex { - public static List history = new ArrayList<>(); + public static final List history = new ArrayList<>(); public GuiLexiconHistory() { super(null); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 733d0b5fd..5c68469d0 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -25,13 +25,13 @@ import vazkii.botania.common.entity.EntityDoppleganger; public class RenderDoppleganger extends RenderBiped { - public static float DEFAULT_GRAIN_INTENSITY = 0.05F; - public static float DEFAULT_DISFIGURATION = 0.025F; + public static final float DEFAULT_GRAIN_INTENSITY = 0.05F; + public static final float DEFAULT_DISFIGURATION = 0.025F; public static float grainIntensity = DEFAULT_GRAIN_INTENSITY; public static float disfiguration = DEFAULT_DISFIGURATION; - public static ShaderCallback callback = shader -> { + public static final ShaderCallback callback = shader -> { // Frag Uniforms int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration); @@ -41,7 +41,7 @@ public class RenderDoppleganger extends RenderBiped { ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); }; - public static ShaderCallback defaultCallback = shader -> { + public static final ShaderCallback defaultCallback = shader -> { // Frag Uniforms int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION); diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java index 1c09a65f8..5f88fa1d3 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java @@ -21,7 +21,7 @@ import vazkii.botania.api.item.IRelic; public class AchievementMod extends Achievement { - public static List achievements = new ArrayList<>(); + public static final List achievements = new ArrayList<>(); public AchievementMod(String name, int x, int y, ItemStack icon, Achievement parent) { super("achievement.botania:" + name, "botania:" + name, x, y, icon, parent); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 28d0a0af6..afd5bfb44 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -26,7 +26,7 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; private static final double RANGE_MINI = 1; - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index cef4b8324..1969fe51c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileVinculotus extends SubTileFunctional { - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; private static final int RANGE = 64; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index bde2d746f..023e8fba2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import com.google.common.base.Predicates; import net.minecraft.block.state.IBlockState; @@ -323,9 +324,9 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { itemToEnchant.writeToNBT(itemCmp); cmp.setTag(TAG_ITEM, itemCmp); - String enchStr = ""; - for(EnchantmentData data : enchants) - enchStr = enchStr + Enchantment.enchantmentRegistry.getNameForObject(data.enchantmentobj) + ":" + data.enchantmentLevel + ","; + String enchStr = enchants.stream() + .map(e -> Enchantment.enchantmentRegistry.getNameForObject(e.enchantmentobj) + ":" + e.enchantmentLevel) + .collect(Collectors.joining(",")); cmp.setString(TAG_ENCHANTS, enchStr.isEmpty() ? enchStr : enchStr.substring(0, enchStr.length() - 1)); } 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 6aed8b5b5..adc3abbfb 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 @@ -315,7 +315,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, long least = cmp.getLong(TAG_UUID_LEAST); UUID identity = getIdentifierUnsafe(); if(identity == null || most != identity.getMostSignificantBits() || least != identity.getLeastSignificantBits()) - identity = new UUID(most, least); + this.identity = new UUID(most, least); } else getIdentifier(); mana = cmp.getInteger(TAG_MANA); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 49ec4f171..30fc3fe6d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -11,7 +11,9 @@ package vazkii.botania.common.block.tile.string; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -24,12 +26,12 @@ import vazkii.botania.api.state.BotaniaStateProps; public class TileRedStringInterceptor extends TileRedString { - public static List interceptors = new ArrayList<>(); + private static final ThreadLocal> interceptors = ThreadLocal.withInitial(HashSet::new);; @Override public void updateEntity() { - if(!interceptors.contains(this)) - interceptors.add(this); + super.updateEntity(); + interceptors.get().add(this); } @Override @@ -37,19 +39,17 @@ public class TileRedStringInterceptor extends TileRedString { return worldObj.getTileEntity(pos) != null; } - public boolean removeFromList() { - return !tileEntityInvalid && worldObj.getTileEntity(pos) == this; + private boolean saneState() { + return !isInvalid() && worldObj.getTileEntity(pos) == this; } public static void onInteract(EntityPlayer player, World world, BlockPos pos, EnumHand hand) { List remove = new ArrayList<>(); boolean did = false; - // CMEs are amazing - List interceptorsCopy = new ArrayList<>(interceptors); - - for(TileRedStringInterceptor inter : interceptorsCopy) { - if(!inter.removeFromList()) { + + for(TileRedStringInterceptor inter : interceptors.get()) { + if(!inter.saneState()) { remove.add(inter); continue; } @@ -68,7 +68,7 @@ public class TileRedStringInterceptor extends TileRedString { } } - interceptors.removeAll(remove); + interceptors.get().removeAll(remove); if(did) { if(world.isRemote) player.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index c2b7cc223..30c8f982d 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -27,7 +27,7 @@ import vazkii.botania.common.lib.LibMisc; public final class BotaniaCreativeTab extends CreativeTabs { - public static BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); + public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); List list; public BotaniaCreativeTab() { diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index 0ea5d6552..c3b612e51 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -11,6 +11,7 @@ package vazkii.botania.common.core.handler; import java.util.ArrayList; +import java.util.List; import java.util.Map.Entry; import net.minecraft.entity.Entity; @@ -37,8 +38,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { - public static ArrayList patterns = new ArrayList<>(); - public static ArrayList defaultPatterns = new ArrayList<>(); + public static final List patterns = new ArrayList<>(); + public static final List defaultPatterns = new ArrayList<>(); @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent event) { diff --git a/src/main/java/vazkii/botania/common/core/helper/Quat.java b/src/main/java/vazkii/botania/common/core/helper/Quat.java index 7ae3c753c..765d50912 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Quat.java +++ b/src/main/java/vazkii/botania/common/core/helper/Quat.java @@ -108,8 +108,8 @@ public class Quat { public String toString() { StringBuilder stringbuilder = new StringBuilder(); Formatter formatter = new Formatter(stringbuilder, Locale.US); - formatter.format("Quaternion:\n"); - formatter.format(" < %f %f %f %f >\n", s, x, y, z); + formatter.format("Quaternion:%n"); + formatter.format(" < %f %f %f %f >%n", s, x, y, z); formatter.close(); return stringbuilder.toString(); } diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 2e1f6e7fb..69e43ee7f 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -30,9 +30,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class Vector3 { - public static Vector3 zero = new Vector3(); - public static Vector3 one = new Vector3(1, 1, 1); - public static Vector3 center = new Vector3(0.5, 0.5, 0.5); + public static final Vector3 zero = new Vector3(); + public static final Vector3 one = new Vector3(1, 1, 1); + public static final Vector3 center = new Vector3(0.5, 0.5, 0.5); public double x; public double y; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 027baa949..6a8885d80 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -12,9 +12,11 @@ package vazkii.botania.common.core.version; import java.awt.Desktop; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URL; import net.minecraft.client.Minecraft; @@ -58,7 +60,7 @@ public class ThreadDownloadMod extends Thread { try { url.openStream().close(); // Add to DL Counter - } catch(IOException e) { } + } catch(IOException ignored) {} url = new URL(base + "files/" + file); webReader = url.openStream(); @@ -87,15 +89,9 @@ public class ThreadDownloadMod extends Thread { Desktop.getDesktop().open(dir); VersionChecker.downloadedFile = true; - finalize(); - } catch(Throwable e) { + } catch (IOException e) { e.printStackTrace(); sendError(); - try { - finalize(); - } catch(Throwable e1) { - e1.printStackTrace(); - } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 8c1fe59c5..c66429ff5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -79,7 +79,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private static final String TAG_DASH_COOLDOWN = "dashCooldown"; private static final String TAG_IS_SPRINTING = "isSprinting"; - public static List playersWithFlight = new ArrayList(); + public static final List playersWithFlight = new ArrayList(); private static final int COST = 35; private static final int COST_OVERKILL = COST * 3; private static final int MAX_FLY_TIME = 1200; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 0e4cfee9a..1320e7cc1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -39,7 +39,7 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - public static Map> playerIceBlocks = new HashMap<>(); + public static final Map> playerIceBlocks = new HashMap<>(); public ItemIcePendant() { super(LibItemNames.ICE_PENDANT); @@ -121,7 +121,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } } - class IceRemover { + private static class IceRemover { int time = 30; final BlockPos coords; 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 bc280391f..c85b6f0ce 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 @@ -45,7 +45,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs private static final int COST = 1; private static final int COST_INTERVAL = 10; - public static List playersWithStepup = new ArrayList<>(); + public static final List playersWithStepup = new ArrayList<>(); final float speed; final float jump; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index e56249902..214180b19 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -16,6 +16,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.PriorityQueue; import java.util.Set; @@ -386,6 +387,11 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker SwapCandidate cand = (SwapCandidate) other; return coordinates.equals(cand.coordinates) && range == cand.range; } + + @Override + public int hashCode() { + return Objects.hash(coordinates, range); + } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index b5450412c..0b1e9ebab 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -42,7 +42,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { private static final int COST = 300; private static final int COST_PER_TICK = COST / TIME; - public static Map playerData = new WeakHashMap<>(); + public static final Map playerData = new WeakHashMap<>(); public ItemSmeltRod() { super(LibItemNames.SMELT_ROD); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 9f501cebb..feb212989 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -159,7 +159,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP return true; } - private class CoordsWithBlock extends BlockPos { + private static class CoordsWithBlock extends BlockPos { private final Block block; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java index ee1d122bd..3cbfa4baf 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java @@ -11,7 +11,9 @@ package vazkii.botania.common.lexicon.page; import java.awt.Desktop; +import java.io.IOException; import java.net.URI; +import java.net.URISyntaxException; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.translation.I18n; @@ -43,7 +45,7 @@ public class PageGuide extends PageText { Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI")); if(Math.random() < 0.01) Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=dQw4w9WgXcQ")); - } catch(Exception e) { } + } catch(IOException | URISyntaxException ignored) { } } }