chore: format code

2023-03-31 11:05:04 +02:00 · 2023-03-31 11:05:04 +02:00 · 2c24ce2b70
parent 329b608b37
commit 2c24ce2b70
6 changed files with 408 additions and 346 deletions
--- a/src/main/java/net/anvilcraft/classiccasting/ItemAspects.java
+++ b/src/main/java/net/anvilcraft/classiccasting/ItemAspects.java
@ -6,9 +6,10 @@ import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;

 public class ItemAspects {
-    
    public static void init() {
-        ThaumcraftApi.registerObjectTag(new ItemStack(CCItems.wandCastingApprentice, 1, 32767), new AspectList().add(Aspect.MAGIC, 4).add(Aspect.TOOL, 2).add(Aspect.CRAFT, 2));        
+        ThaumcraftApi.registerObjectTag(
+            new ItemStack(CCItems.wandCastingApprentice, 1, 32767),
+            new AspectList().add(Aspect.MAGIC, 4).add(Aspect.TOOL, 2).add(Aspect.CRAFT, 2)
+        );
    }
-
 }
--- a/src/main/java/net/anvilcraft/classiccasting/Recipes.java
+++ b/src/main/java/net/anvilcraft/classiccasting/Recipes.java
@ -51,9 +51,9 @@ public class Recipes {
        Research.arcaneRecipes.put(
            "ArcaneWood1",
            ThaumcraftApi.addArcaneCraftingRecipe(
-                "MAGBLOCKS", 
-                new ItemStack(CCBlocks.blockArcaneWood, 2), 
-                new AspectList().add(Aspects.VIS, 20), 
+                "MAGBLOCKS",
+                new ItemStack(CCBlocks.blockArcaneWood, 2),
+                new AspectList().add(Aspects.VIS, 20),
                "WWW",
                "WWW",
                "WWW",
@ -65,9 +65,9 @@ public class Recipes {
        Research.arcaneRecipes.put(
            "ArcaneWood2",
            ThaumcraftApi.addArcaneCraftingRecipe(
-                "MAGBLOCKS", 
-                new ItemStack(CCBlocks.blockArcaneWood, 4), 
-                new AspectList().add(Aspects.VIS, 20), 
+                "MAGBLOCKS",
+                new ItemStack(CCBlocks.blockArcaneWood, 4),
+                new AspectList().add(Aspects.VIS, 20),
                "WW",
                "WW",
                'W',
@ -351,17 +351,18 @@ public class Recipes {

    public static void addClusters() {
        for (int i = 0; i <= 10; i++) {
-            if (i == 6 || i == 7 || i == 9) continue;
+            if (i == 6 || i == 7 || i == 9)
+                continue;
            int k = i > 6 ? i - 1 : i;
            Research.clusters[k] = AuracoreRecipes.addShapelessInfusionCraftingRecipe(
-                "CRYSTALCLUSTER" + i, 
-                "CRYSTALCLUSTER", 
-                100, 
+                "CRYSTALCLUSTER" + i,
+                "CRYSTALCLUSTER",
+                100,
                new AspectList()
                    .add(Aspect.CRYSTAL, 8)
                    .add(Aspect.MAGIC, 8)
-                    .add(Aspect.EXCHANGE, 8), 
-                new ItemStack(ConfigBlocks.blockCrystal, 1, i), 
+                    .add(Aspect.EXCHANGE, 8),
+                new ItemStack(ConfigBlocks.blockCrystal, 1, i),
                new ItemStack(ConfigItems.itemShard, 1, k),
                new ItemStack(ConfigItems.itemShard, 1, k),
                new ItemStack(ConfigItems.itemShard, 1, k),
@ -371,14 +372,14 @@ public class Recipes {
            );
        }
        Research.clusters[6] = AuracoreRecipes.addShapelessInfusionCraftingRecipe(
-            "CRYSTALCLUSTER6", 
-            "CRYSTALCLUSTER", 
-            100, 
+            "CRYSTALCLUSTER6",
+            "CRYSTALCLUSTER",
+            100,
            new AspectList()
                .add(Aspect.CRYSTAL, 8)
                .add(Aspect.MAGIC, 8)
-                .add(Aspect.EXCHANGE, 8), 
-            new ItemStack(ConfigBlocks.blockCrystal, 1, 6), 
+                .add(Aspect.EXCHANGE, 8),
+            new ItemStack(ConfigBlocks.blockCrystal, 1, 6),
            new ItemStack(ConfigItems.itemShard, 1, 0),
            new ItemStack(ConfigItems.itemShard, 1, 1),
            new ItemStack(ConfigItems.itemShard, 1, 2),
@ -387,14 +388,14 @@ public class Recipes {
            new ItemStack(ConfigItems.itemShard, 1, 5)
        );
        Research.clusters[8] = AuracoreRecipes.addShapelessInfusionCraftingRecipe(
-            "CRYSTALCLUSTER9", 
-            "CRYSTALCLUSTER", 
-            100, 
+            "CRYSTALCLUSTER9",
+            "CRYSTALCLUSTER",
+            100,
            new AspectList()
                .add(Aspect.CRYSTAL, 8)
                .add(Aspect.MAGIC, 8)
-                .add(Aspect.EXCHANGE, 8), 
-            new ItemStack(ConfigBlocks.blockCrystal, 1, 9), 
+                .add(Aspect.EXCHANGE, 8),
+            new ItemStack(ConfigBlocks.blockCrystal, 1, 9),
            new ItemStack(ConfigItems.itemShard, 1, 0),
            new ItemStack(ConfigItems.itemShard, 1, 1),
            new ItemStack(ConfigItems.itemShard, 1, 2),
@ -405,14 +406,18 @@ public class Recipes {

    @SuppressWarnings("unchecked")
    public static void removeClusters() {
-        CraftingManager.getInstance().getRecipeList().removeIf((r) -> isCrystalCluster(r));
+        CraftingManager.getInstance().getRecipeList().removeIf(
+            (r) -> isCrystalCluster(r)
+        );
    }

    public static boolean isCrystalCluster(Object recipe) {
-        if (!(recipe instanceof IRecipe)) return false;
+        if (!(recipe instanceof IRecipe))
+            return false;
        IRecipe r = (IRecipe) recipe;
        ItemStack output = r.getRecipeOutput();
-        if (output == null) return false;
+        if (output == null)
+            return false;
        Item item = output.getItem();
        return Block.getBlockFromItem(item) == ConfigBlocks.blockCrystal;
    }
--- a/src/main/java/net/anvilcraft/classiccasting/Research.java
+++ b/src/main/java/net/anvilcraft/classiccasting/Research.java
@ -83,353 +83,405 @@ public class Research {
            new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")
        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem("CCAURA", "CLASSICCASTING", new AspectList(), -2, -4, 1, new ResourceLocation("classiccasting", "textures/misc/aura.png"))
-            .setPages(
-                new ResearchPage("classiccasting.research_page.CCAURA.1"),
-                new ResearchPage("classiccasting.research_page.CCAURA.2")
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "CCAURA",
+                "CLASSICCASTING",
+                new AspectList(),
+                -2,
+                -4,
+                1,
+                new ResourceLocation("classiccasting", "textures/misc/aura.png")
            )
-            .setAutoUnlock()
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.CCAURA.1"),
+                    new ResearchPage("classiccasting.research_page.CCAURA.2")
+                )
+                .setAutoUnlock()
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem("CCFLUX", "CLASSICCASTING", new AspectList(), -4, -4, 1, new ResourceLocation("classiccasting", "textures/misc/flux.png"))
-            .setPages(
-                new ResearchPage("classiccasting.research_page.CCFLUX.1"),
-                new ResearchPage("classiccasting.research_page.CCFLUX.2")
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "CCFLUX",
+                "CLASSICCASTING",
+                new AspectList(),
+                -4,
+                -4,
+                1,
+                new ResourceLocation("classiccasting", "textures/misc/flux.png")
            )
-            .setAutoUnlock()
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.CCFLUX.1"),
+                    new ResearchPage("classiccasting.research_page.CCFLUX.2")
+                )
+                .setAutoUnlock()
+                .registerResearchItem()
+        );

        // TODO: move research to right place
-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "MAGBLOCKS",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspects.ROCK, 1)
-                .add(Aspect.METAL, 1)
-                .add(Aspect.MAGIC, 1)
-                .add(Aspect.TREE, 1)
-                .add(Aspect.CRAFT, 1),
-            -2,
-            -2,
-            2,
-            new ItemStack(CCBlocks.infusionWorkbench)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.MAGBLOCKS.1"),
-                new ResearchPage(arcaneRecipes.get("ArcaneStone")),
-                new ResearchPage(arcaneRecipes.get("ArcaneWood1")),
-                new ResearchPage(arcaneRecipes.get("ArcaneWood2")),
-                new ResearchPage("classiccasting.research_page.MAGBLOCKS.2"),
-                new ResearchPage(infusionStructure),
-                new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "MAGBLOCKS",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspects.ROCK, 1)
+                    .add(Aspect.METAL, 1)
+                    .add(Aspect.MAGIC, 1)
+                    .add(Aspect.TREE, 1)
+                    .add(Aspect.CRAFT, 1),
+                -2,
+                -2,
+                2,
+                new ItemStack(CCBlocks.infusionWorkbench)
            )
-            .setParents("THAUMIUM")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.MAGBLOCKS.1"),
+                    new ResearchPage(arcaneRecipes.get("ArcaneStone")),
+                    new ResearchPage(arcaneRecipes.get("ArcaneWood1")),
+                    new ResearchPage(arcaneRecipes.get("ArcaneWood2")),
+                    new ResearchPage("classiccasting.research_page.MAGBLOCKS.2"),
+                    new ResearchPage(infusionStructure),
+                    new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
+                )
+                .setParents("THAUMIUM")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "AURACOMPASS",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.MAGIC, 8)
-                .add(Aspect.MIND, 8)
-                .add(Aspect.MECHANISM, 4),
-            -2,
-            0,
-            2,
-            new ItemStack(CCItems.auraCompass)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.AURACOMPASS"),
-                new ResearchPage(arcaneRecipes.get("AuraCompass"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "AURACOMPASS",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.MAGIC, 8)
+                    .add(Aspect.MIND, 8)
+                    .add(Aspect.MECHANISM, 4),
+                -2,
+                0,
+                2,
+                new ItemStack(CCItems.auraCompass)
            )
-            .setParents("MAGBLOCKS")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.AURACOMPASS"),
+                    new ResearchPage(arcaneRecipes.get("AuraCompass"))
+                )
+                .setParents("MAGBLOCKS")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "CRYSTALCORE",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.MAGIC, 32)
-                .add(Aspects.CONTROL, 32)
-                .add(Aspect.EXCHANGE, 24)
-                .add(Aspects.FLUX, 16)
-                .add(Aspect.MOTION, 32)
-                .add(Aspect.VOID, 16),
-            -3,
-            7,
-            3,
-            new ItemStack(CCBlocks.crystal)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.CRYSTALCORE.1"),
-                new ResearchPageInfusion(infusionRecipes.get("CrystalCore")),
-                new ResearchPage("classiccasting.research_page.CRYSTALCORE.2"),
-                new ResearchPage(magnetStructure)
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "CRYSTALCORE",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.MAGIC, 32)
+                    .add(Aspects.CONTROL, 32)
+                    .add(Aspect.EXCHANGE, 24)
+                    .add(Aspects.FLUX, 16)
+                    .add(Aspect.MOTION, 32)
+                    .add(Aspect.VOID, 16),
+                -3,
+                7,
+                3,
+                new ItemStack(CCBlocks.crystal)
            )
-            .setParents("THETHEORYOFEVERYTHING", "CRYSTALCLUSTER")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.CRYSTALCORE.1"),
+                    new ResearchPageInfusion(infusionRecipes.get("CrystalCore")),
+                    new ResearchPage("classiccasting.research_page.CRYSTALCORE.2"),
+                    new ResearchPage(magnetStructure)
+                )
+                .setParents("THETHEORYOFEVERYTHING", "CRYSTALCLUSTER")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "CRYSTALCAPACITOR",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.CRYSTAL, 24)
-                .add(Aspect.MAGIC, 32)
-                .add(Aspect.EXCHANGE, 24),
-            -5,
-            7,
-            1,
-            new ItemStack(CCBlocks.crystal, 1, 1)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.CRYSTALCORE"),
-                new ResearchPageInfusion(infusionRecipes.get("CrystalCapacitor"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "CRYSTALCAPACITOR",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.CRYSTAL, 24)
+                    .add(Aspect.MAGIC, 32)
+                    .add(Aspect.EXCHANGE, 24),
+                -5,
+                7,
+                1,
+                new ItemStack(CCBlocks.crystal, 1, 1)
            )
-            .setParents("CRYSTALCORE")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.CRYSTALCORE"),
+                    new ResearchPageInfusion(infusionRecipes.get("CrystalCapacitor"))
+                )
+                .setParents("CRYSTALCORE")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "UNIFIEDTHAUMICFIELDTHEORY",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.MIND, 8)
-                .add(Aspects.FLUX, 8)
-                .add(Aspect.MAGIC, 8)
-                .add(Aspect.FIRE, 8)
-                .add(Aspect.AIR, 8)
-                .add(Aspect.EARTH, 8)
-                .add(Aspect.WATER, 8)
-                .add(Aspects.TIME, 4),
-            0,
-            0,
-            3,
-            new ResourceLocation(
-                "classiccasting", "textures/misc/unified_thaumic_field_theory.png"
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "UNIFIEDTHAUMICFIELDTHEORY",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.MIND, 8)
+                    .add(Aspects.FLUX, 8)
+                    .add(Aspect.MAGIC, 8)
+                    .add(Aspect.FIRE, 8)
+                    .add(Aspect.AIR, 8)
+                    .add(Aspect.EARTH, 8)
+                    .add(Aspect.WATER, 8)
+                    .add(Aspects.TIME, 4),
+                0,
+                0,
+                3,
+                new ResourceLocation(
+                    "classiccasting", "textures/misc/unified_thaumic_field_theory.png"
+                )
            )
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.UNIFIEDTHAUMICFIELDTHEORY"
-                ),
-                new ResearchPageInfusion(infusionRecipes.get("AdeptWand"))
-            )
-            .setParents("MAGBLOCKS")
-            .setSpecial()
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage(
+                        "classiccasting.research_page.UNIFIEDTHAUMICFIELDTHEORY"
+                    ),
+                    new ResearchPageInfusion(infusionRecipes.get("AdeptWand"))
+                )
+                .setParents("MAGBLOCKS")
+                .setSpecial()
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "WANDFIRE",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspects.DESTRUCTION, 8)
-                .add(Aspect.MAGIC, 8)
-                .add(Aspect.WEAPON, 8)
-                .add(Aspect.FIRE, 8),
-            1,
-            2,
-            2,
-            new ItemStack(CCItems.wandFire)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.WANDFIRE"),
-                new ResearchPageInfusion(infusionRecipes.get("WandFire"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "WANDFIRE",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspects.DESTRUCTION, 8)
+                    .add(Aspect.MAGIC, 8)
+                    .add(Aspect.WEAPON, 8)
+                    .add(Aspect.FIRE, 8),
+                1,
+                2,
+                2,
+                new ItemStack(CCItems.wandFire)
            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.WANDFIRE"),
+                    new ResearchPageInfusion(infusionRecipes.get("WandFire"))
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "WANDFROST",
-            "CLASSICCASTING",
-            new AspectList().add(Aspect.COLD, 16).add(Aspect.WEAPON, 4),
-            1,
-            3,
-            2,
-            new ItemStack(CCItems.wandFrost)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.WANDFROST"),
-                new ResearchPageInfusion(infusionRecipes.get("WandFrost"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "WANDFROST",
+                "CLASSICCASTING",
+                new AspectList().add(Aspect.COLD, 16).add(Aspect.WEAPON, 4),
+                1,
+                3,
+                2,
+                new ItemStack(CCItems.wandFrost)
            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.WANDFROST"),
+                    new ResearchPageInfusion(infusionRecipes.get("WandFrost"))
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "WANDTRADE",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.EXCHANGE, 16)
-                .add(Aspect.MAGIC, 8)
-                .add(Aspect.TOOL, 8),
-            -1,
-            4,
-            2,
-            new ItemStack(CCItems.wandTrade)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.WANDTRADE"),
-                new ResearchPageInfusion(infusionRecipes.get("WandTrade"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "WANDTRADE",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.EXCHANGE, 16)
+                    .add(Aspect.MAGIC, 8)
+                    .add(Aspect.TOOL, 8),
+                -1,
+                4,
+                2,
+                new ItemStack(CCItems.wandTrade)
            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.WANDTRADE"),
+                    new ResearchPageInfusion(infusionRecipes.get("WandTrade"))
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "WANDEXCAVATE",
-            "CLASSICCASTING",
-            new AspectList().add(Aspect.METAL, 16).add(Aspect.TOOL, 4),
-            -1,
-            3,
-            2,
-            new ItemStack(CCItems.wandExcavation)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.WANDEXCAVATE"),
-                new ResearchPageInfusion(infusionRecipes.get("WandExcavate"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "WANDEXCAVATE",
+                "CLASSICCASTING",
+                new AspectList().add(Aspect.METAL, 16).add(Aspect.TOOL, 4),
+                -1,
+                3,
+                2,
+                new ItemStack(CCItems.wandExcavation)
            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.WANDEXCAVATE"),
+                    new ResearchPageInfusion(infusionRecipes.get("WandExcavate"))
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "WANDLIGHTNING",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspects.DESTRUCTION, 8)
-                .add(Aspect.MAGIC, 8)
-                .add(Aspect.WEAPON, 8)
-                .add(Aspect.ENERGY, 8),
-            1,
-            4,
-            2,
-            new ItemStack(CCItems.wandLightning)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.WANDLIGHTNING"),
-                new ResearchPageInfusion(infusionRecipes.get("WandLightning"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "WANDLIGHTNING",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspects.DESTRUCTION, 8)
+                    .add(Aspect.MAGIC, 8)
+                    .add(Aspect.WEAPON, 8)
+                    .add(Aspect.ENERGY, 8),
+                1,
+                4,
+                2,
+                new ItemStack(CCItems.wandLightning)
            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.WANDLIGHTNING"),
+                    new ResearchPageInfusion(infusionRecipes.get("WandLightning"))
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "BASICFLUX",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspects.FLUX, 20)
-                .add(Aspects.CONTROL, 8)
-                .add(Aspect.EXCHANGE, 8)
-                .add(Aspects.PURE, 8)
-                .add(Aspect.MECHANISM, 4),
-            -3,
-            4,
-            2,
-            new ResourceLocation("classiccasting", "textures/misc/basic_flux.png")
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.BASICFLUX.1"),
-                new ResearchPageInfusion(infusionRecipes.get("FluxFilter")),
-                new ResearchPage("classiccasting.research_page.BASICFLUX.2"),
-                new ResearchPageInfusion(infusionRecipes.get("Alembic")),
-                new ResearchPage("classiccasting.research_page.BASICFLUX.3")
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "BASICFLUX",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspects.FLUX, 20)
+                    .add(Aspects.CONTROL, 8)
+                    .add(Aspect.EXCHANGE, 8)
+                    .add(Aspects.PURE, 8)
+                    .add(Aspect.MECHANISM, 4),
+                -3,
+                4,
+                2,
+                new ResourceLocation("classiccasting", "textures/misc/basic_flux.png")
            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY", "DISTILESSENTIA")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.BASICFLUX.1"),
+                    new ResearchPageInfusion(infusionRecipes.get("FluxFilter")),
+                    new ResearchPage("classiccasting.research_page.BASICFLUX.2"),
+                    new ResearchPageInfusion(infusionRecipes.get("Alembic")),
+                    new ResearchPage("classiccasting.research_page.BASICFLUX.3")
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY", "DISTILESSENTIA")
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "THETHEORYOFEVERYTHING",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.MIND, 24)
-                .add(Aspect.ARMOR, 8)
-                .add(Aspects.INSECT, 8)
-                .add(Aspect.PLANT, 8)
-                .add(Aspect.WEAPON, 8)
-                .add(Aspect.BEAST, 8)
-                .add(Aspect.FLESH, 8)
-                .add(Aspect.LIFE, 8)
-                .add(Aspect.POISON, 8)
-                .add(Aspect.TREE, 8)
-                .add(Aspect.CROP, 8)
-                .add(Aspects.FLOWER, 8)
-                .add(Aspect.MECHANISM, 8)
-                .add(Aspects.SOUND, 8)
-                .add(Aspect.CRYSTAL, 8)
-                .add(Aspects.FUNGUS, 8)
-                .add(Aspect.METAL, 8)
-                .add(Aspect.TOOL, 8),
-            0,
-            7,
-            3,
-            new ResourceLocation(
-                "classiccasting", "textures/misc/the_theory_of_everything.png"
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "THETHEORYOFEVERYTHING",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.MIND, 24)
+                    .add(Aspect.ARMOR, 8)
+                    .add(Aspects.INSECT, 8)
+                    .add(Aspect.PLANT, 8)
+                    .add(Aspect.WEAPON, 8)
+                    .add(Aspect.BEAST, 8)
+                    .add(Aspect.FLESH, 8)
+                    .add(Aspect.LIFE, 8)
+                    .add(Aspect.POISON, 8)
+                    .add(Aspect.TREE, 8)
+                    .add(Aspect.CROP, 8)
+                    .add(Aspects.FLOWER, 8)
+                    .add(Aspect.MECHANISM, 8)
+                    .add(Aspects.SOUND, 8)
+                    .add(Aspect.CRYSTAL, 8)
+                    .add(Aspects.FUNGUS, 8)
+                    .add(Aspect.METAL, 8)
+                    .add(Aspect.TOOL, 8),
+                0,
+                7,
+                3,
+                new ResourceLocation(
+                    "classiccasting", "textures/misc/the_theory_of_everything.png"
+                )
            )
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.THETHEORYOFEVERYTHING"),
-                new ResearchPageInfusion(infusionRecipes.get("MageWand"))
-            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY", "BASICFLUX", "GOLEMSTRAW")
-            .setSpecial()
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.THETHEORYOFEVERYTHING"
+                    ),
+                    new ResearchPageInfusion(infusionRecipes.get("MageWand"))
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY", "BASICFLUX", "GOLEMSTRAW")
+                .setSpecial()
+                .registerResearchItem()
+        );

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "HELLROD",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.FIRE, 24)
-                .add(Aspect.MAGIC, 16)
-                .add(Aspect.WEAPON, 16)
-                .add(Aspect.BEAST, 24)
-                .add(Aspects.EVIL, 24),
-            3,
-            7,
-            2,
-            new ItemStack(CCItems.wandHellrod)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.HELLROD"),
-                new ResearchPageInfusion(infusionRecipes.get("WandHellrod"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "HELLROD",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.FIRE, 24)
+                    .add(Aspect.MAGIC, 16)
+                    .add(Aspect.WEAPON, 16)
+                    .add(Aspect.BEAST, 24)
+                    .add(Aspects.EVIL, 24),
+                3,
+                7,
+                2,
+                new ItemStack(CCItems.wandHellrod)
            )
-            .setParents("THETHEORYOFEVERYTHING", "WANDFIRE")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.HELLROD"),
+                    new ResearchPageInfusion(infusionRecipes.get("WandHellrod"))
+                )
+                .setParents("THETHEORYOFEVERYTHING", "WANDFIRE")
+                .registerResearchItem()
+        );
        ThaumcraftApi.addWarpToResearch("HELLROD", 2);
        ThaumcraftApi.addWarpToItem(new ItemStack(CCItems.wandHellrod), 1);

-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "PORTABLEHOLE",
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.VOID, 20)
-                .add(Aspect.MOTION, 8)
-                .add(Aspect.ELDRITCH, 8)
-                .add(Aspect.EXCHANGE, 8),
-            -3,
-            2,
-            1,
-            new ItemStack(CCItems.portableHole)
-        )
-            .setPages(
-                new ResearchPage("classiccasting.research_page.PORTABLEHOLE"),
-                new ResearchPageInfusion(infusionRecipes.get("PortableHole"))
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "PORTABLEHOLE",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.VOID, 20)
+                    .add(Aspect.MOTION, 8)
+                    .add(Aspect.ELDRITCH, 8)
+                    .add(Aspect.EXCHANGE, 8),
+                -3,
+                2,
+                1,
+                new ItemStack(CCItems.portableHole)
            )
-            .setParents("UNIFIEDTHAUMICFIELDTHEORY", "ENCHFABRIC")
-            .registerResearchItem());
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.PORTABLEHOLE"),
+                    new ResearchPageInfusion(infusionRecipes.get("PortableHole"))
+                )
+                .setParents("UNIFIEDTHAUMICFIELDTHEORY", "ENCHFABRIC")
+                .registerResearchItem()
+        );

        ResearchPage crystalPage = new ResearchPageInfusion(clusters);
        crystalPage.recipeOutput = new ItemStack(ConfigBlocks.blockCrystal, 1, 9);
-        CCResearchManager.addDiscoverableResearch(new ResearchItem(
-            "CRYSTALCLUSTER", 
-            "CLASSICCASTING",
-            new AspectList()
-                .add(Aspect.CRYSTAL, 24)
-                .add(Aspect.MAGIC, 32)
-                .add(Aspect.EXCHANGE, 24),
-            -2,
-            6,
-            1,
-            new ItemStack(ConfigBlocks.blockCrystal, 1, 9)
-        )
-        .setPages(
-            new ResearchPage("classiccasting.research_page.CRYSTALCLUSTER"),
-            crystalPage
-        )
-        .setParents("BASICFLUX")
-        .registerResearchItem());
+        CCResearchManager.addDiscoverableResearch(
+            new ResearchItem(
+                "CRYSTALCLUSTER",
+                "CLASSICCASTING",
+                new AspectList()
+                    .add(Aspect.CRYSTAL, 24)
+                    .add(Aspect.MAGIC, 32)
+                    .add(Aspect.EXCHANGE, 24),
+                -2,
+                6,
+                1,
+                new ItemStack(ConfigBlocks.blockCrystal, 1, 9)
+            )
+                .setPages(
+                    new ResearchPage("classiccasting.research_page.CRYSTALCLUSTER"),
+                    crystalPage
+                )
+                .setParents("BASICFLUX")
+                .registerResearchItem()
+        );
    }
 }
--- a/src/main/java/net/anvilcraft/classiccasting/blocks/BlockArcaneWood.java
+++ b/src/main/java/net/anvilcraft/classiccasting/blocks/BlockArcaneWood.java
@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.world.IBlockAccess;

 public class BlockArcaneWood extends Block {
-
    public BlockArcaneWood() {
        super(Material.wood);
        this.setHardness(2.0f);
@ -28,8 +27,9 @@ public class BlockArcaneWood extends Block {
    }

    @Override
-    public boolean isBeaconBase(IBlockAccess arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6) {
+    public boolean isBeaconBase(
+        IBlockAccess arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6
+    ) {
        return true;
    }
-    
 }
--- a/src/main/java/net/anvilcraft/classiccasting/container/SlotResearchTableOutput.java
+++ b/src/main/java/net/anvilcraft/classiccasting/container/SlotResearchTableOutput.java
@ -18,7 +18,8 @@ class SlotResearchTableOutput extends Slot {
    }

    public boolean isItemValid(ItemStack par1ItemStack) {
-        return (par1ItemStack.getItem() == CCItems.researchNotes || par1ItemStack.getItem() == ConfigItems.itemResearchNotes)
+        return (par1ItemStack.getItem() == CCItems.researchNotes
+                || par1ItemStack.getItem() == ConfigItems.itemResearchNotes)
            && par1ItemStack.getItemDamage() < 64;
    }

@ -27,7 +28,9 @@ class SlotResearchTableOutput extends Slot {
        if (note != null && note.getItem() == ConfigItems.itemResearchNotes) {
            ResearchNoteData data = ResearchManager.getData(note);
            if (data != null && !CCResearchManager.isDiscoverable(data.key)) {
-                note = CCResearchManager.createNote(new ItemStack(CCItems.researchNotes), data.key);
+                note = CCResearchManager.createNote(
+                    new ItemStack(CCItems.researchNotes), data.key
+                );
            } else {
                note = new ItemStack(Items.paper);
            }
--- a/src/main/java/net/anvilcraft/classiccasting/research/CCResearchManager.java
+++ b/src/main/java/net/anvilcraft/classiccasting/research/CCResearchManager.java
@ -19,7 +19,6 @@ import thaumcraft.common.config.ConfigItems;
 import thaumcraft.common.lib.research.ResearchManager;

 public class CCResearchManager {
-
    public static Set<String> discoverable = new HashSet<>();

    public static ItemStack createNote(ItemStack stack, String key) {
@ -276,7 +275,9 @@ public class CCResearchManager {
            return true;
        } else {
            ResearchItem item = ResearchCategories.getResearch(key);
-            return item != null && (item.category == "ALCHEMY" || item.category == "ARTIFICE" || item.category == "GOLEMANCY");
+            return item != null
+                && (item.category == "ALCHEMY" || item.category == "ARTIFICE"
+                    || item.category == "GOLEMANCY");
        }
    }