diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 8817dd25..776bee6d 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -35,18 +35,18 @@ public interface IBloodMagicAPI { /** * Registers an {@link IBlockState} as a given component for the Blood Altar. - * + *

* Valid component types: *

* - * @param state The state to register + * @param state The state to register * @param componentType The type of Blood Altar component to register as. */ void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java index 61123c52..3817725d 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -16,12 +16,12 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Blood Altar. * - * @param input An input {@link Ingredient}. - * @param output An output {@link ItemStack}. + * @param input An input {@link Ingredient}. + * @param output An output {@link ItemStack}. * @param minimumTier The minimum Blood Altar tier required for this recipe. - * @param syphon The amount of Life Essence to syphon from the Blood Altar over the course of the craft. + * @param syphon The amount of Life Essence to syphon from the Blood Altar over the course of the craft. * @param consumeRate How quickly the Life Essence is syphoned. - * @param drainRate How quickly progress is lost if the Blood Altar runs out of Life Essence during the craft. + * @param drainRate How quickly progress is lost if the Blood Altar runs out of Life Essence during the craft. */ void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); @@ -29,7 +29,6 @@ public interface IBloodMagicRecipeRegistrar { * Removes a Blood Altar recipe based on an input {@link ItemStack}. * * @param input The input item to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeBloodAltar(@Nonnull ItemStack input); @@ -37,11 +36,11 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Alchemy Table. * - * @param output An output {@link ItemStack}. - * @param syphon The amount of Life Essence to syphon from the Blood Orb's bound network over the course of the craft. - * @param ticks The amount of ticks it takes to complete the craft. + * @param output An output {@link ItemStack}. + * @param syphon The amount of Life Essence to syphon from the Blood Orb's bound network over the course of the craft. + * @param ticks The amount of ticks it takes to complete the craft. * @param minimumTier The minimum Blood Orb tier required for this recipe. - * @param input An array of {@link Ingredient}s to accept as inputs. + * @param input An array of {@link Ingredient}s to accept as inputs. */ void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); @@ -49,7 +48,6 @@ public interface IBloodMagicRecipeRegistrar { * Removes an Alchemy Table recipe based on an input {@link ItemStack} array. * * @param input The input items to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeAlchemyTable(@Nonnull ItemStack... input); @@ -57,10 +55,10 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Soul/Tartaric Forge. * - * @param output An output {@link ItemStack}. + * @param output An output {@link ItemStack}. * @param minimumSouls The minimum number of souls that must be contained in the Soul Gem. - * @param soulDrain The number of souls to drain from the Soul Gem. - * @param input An array of {@link Ingredient}s to accept as inputs. + * @param soulDrain The number of souls to drain from the Soul Gem. + * @param input An array of {@link Ingredient}s to accept as inputs. */ void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); @@ -68,7 +66,6 @@ public interface IBloodMagicRecipeRegistrar { * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack} array. * * @param input The input items to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeTartaricForge(@Nonnull ItemStack... input); @@ -76,9 +73,9 @@ public interface IBloodMagicRecipeRegistrar { /** * Adds a new recipe to the Alchemy Array. * - * @param input An input {@link Ingredient}. First item put into the Alchemy Array. - * @param catalyst A catalyst {@link Ingredient}. Second item put into the Alchemy Array. - * @param output An output {@link ItemStack}. + * @param input An input {@link Ingredient}. First item put into the Alchemy Array. + * @param catalyst A catalyst {@link Ingredient}. Second item put into the Alchemy Array. + * @param output An output {@link ItemStack}. * @param circleTexture The texture to render for the Alchemy Array circle. */ void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture); @@ -86,9 +83,8 @@ public interface IBloodMagicRecipeRegistrar { /** * Removes an Alchemy Array recipe based on an input {@link ItemStack} and it's catalyst {@link ItemStack}. * - * @param input The input item to remove the recipe of. + * @param input The input item to remove the recipe of. * @param catalyst The catalyst item to remove the recipe of. - * * @return Whether or not a recipe was removed. */ boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst); diff --git a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java index 1f22de5a..f51db50c 100644 --- a/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java +++ b/src/api/java/WayofTime/bloodmagic/api/IBloodMagicValueManager.java @@ -16,27 +16,27 @@ public interface IBloodMagicValueManager { * the value to 0 effectively disables sacrificing. * * @param entityId The registry name of the entity. - * @param value The amount of LP per health point to receive upon sacrifice. + * @param value The amount of LP per health point to receive upon sacrifice. */ void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value); /** * Sets the Tranquility value of a given {@link IBlockState}. - * + *

* Valid tranquility types: *

* - * @param state The {@link IBlockState} to set the value of. + * @param state The {@link IBlockState} to set the value of. * @param tranquilityType The type of Tranquility this block should provide. - * @param value The amount of tranquility this block should provide. + * @param value The amount of tranquility this block should provide. */ void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value); } diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 08bdce42..c8671049 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; -import WayofTime.bloodmagic.api.BloodMagicPlugin; -import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 23e12138..0a87cb07 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -11,36 +11,44 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod.EventBusSubscriber(modid = BloodMagic.MODID) public class ConfigHandler { - @Config.Comment({ "Blacklist options for various features" }) + @Config.Comment({"Blacklist options for various features"}) public static ConfigBlacklist blacklist = new ConfigBlacklist(); - @Config.Comment({ "Value modifiers for various features" }) + @Config.Comment({"Value modifiers for various features"}) public static ConfigValues values = new ConfigValues(); - @Config.Comment({ "Toggles for all rituals" }) + @Config.Comment({"Toggles for all rituals"}) public static ConfigRituals rituals = new ConfigRituals(); - @Config.Comment({ "Settings that only pertain to the client" }) + @Config.Comment({"Settings that only pertain to the client"}) public static ConfigClient client = new ConfigClient(); - @Config.Comment({ "Compatibility settings" }) + @Config.Comment({"Compatibility settings"}) public static ConfigCompat compat = new ConfigCompat(); + @SubscribeEvent + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { + if (event.getModID().equals(BloodMagic.MODID)) { + ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values + MeteorConfigHandler.handleMeteors(false); // Reload meteors + } + } + public static class ConfigBlacklist { - @Config.Comment({ "Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state." }) - public String[] teleposer = { "bedrock", "mob_spawner" }; - @Config.Comment({ "Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid." }) - public String[] transposer = { "bedrock", "mob_spawner" }; - @Config.Comment({ "Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid." }) - public String[] wellOfSuffering = { }; + @Config.Comment({"Stops listed blocks and entities from being teleposed.", "Use the registry name of the block or entity. Vanilla objects do not require the modid.", "If a block is specified, you can list the variants to only blacklist a given state."}) + public String[] teleposer = {"bedrock", "mob_spawner"}; + @Config.Comment({"Stops listed blocks from being transposed.", "Use the registry name of the block. Vanilla blocks do not require the modid."}) + public String[] transposer = {"bedrock", "mob_spawner"}; + @Config.Comment({"Stops the listed entities from being used in the Well of Suffering.", "Use the registry name of the entity. Vanilla entities do not require the modid."}) + public String[] wellOfSuffering = {}; } public static class ConfigValues { - @Config.Comment({ "Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid." }) - public String[] sacrificialValues = { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100" }; - @Config.Comment({ "Amount of LP the Coat of Arms should provide for each damage dealt." }) + @Config.Comment({"Declares the amount of LP gained per HP sacrificed for the given entity.", "Setting the value to 0 will blacklist it.", "Use the registry name of the entity followed by a ';' and then the value you want.", "Vanilla entities do not require the modid."}) + public String[] sacrificialValues = {"villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", "ocelot;100", "pig;100", "rabbit;100"}; + @Config.Comment({"Amount of LP the Coat of Arms should provide for each damage dealt."}) @Config.RangeInt(min = 0, max = 100) public int coatOfArmsConversion = 20; - @Config.Comment({ "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) + @Config.Comment({"Amount of LP the Sacrificial Dagger should provide for each damage dealt."}) @Config.RangeInt(min = 0, max = 10000) public int sacrificialDaggerConversion = 100; - @Config.Comment({ "Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) + @Config.Comment({"Will rewrite any default meteor types with new versions.", "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated."}) public boolean shouldResyncMeteors = true; } @@ -85,31 +93,22 @@ public class ConfigHandler { } public static class ConfigClient { - @Config.Comment({ "Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held." }) + @Config.Comment({"Always render the beams between routing nodes.", "If disabled, the beams will only render while the Node Router is held."}) public boolean alwaysRenderRoutingLines = false; - @Config.Comment({ "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) + @Config.Comment({"Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed."}) public boolean invisibleSpectralBlocks = true; - @Config.Comment({ "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar." }) + @Config.Comment({"When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", "If disabled, it will behave identically to the default hotbar."}) public boolean sigilHoldingSkipsEmptySlots = false; } public static class ConfigCompat { - @Config.Comment({ "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) + @Config.Comment({"The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory."}) public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; public enum AltarDisplayMode { ALWAYS, SIGIL_HELD, - SIGIL_CONTAINED, - ; - } - } - - @SubscribeEvent - public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { - if (event.getModID().equals(BloodMagic.MODID)) { - ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values - MeteorConfigHandler.handleMeteors(false); // Reload meteors + SIGIL_CONTAINED,; } } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 2002bfc5..859c2ffd 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.altar; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.apibutnotreally.BlockStack; import WayofTime.bloodmagic.apibutnotreally.Constants; @@ -8,7 +9,6 @@ import WayofTime.bloodmagic.apibutnotreally.altar.*; import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index 3a6ab28c..df5dc2b0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,16 +1,13 @@ package WayofTime.bloodmagic.api.impl; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import WayofTime.bloodmagic.api.IBloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; -import java.util.*; +import java.util.List; public class BloodMagicAPI implements IBloodMagicAPI { diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 4d456f95..f6255a0f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -2,18 +2,18 @@ package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import WayofTime.bloodmagic.api.BloodMagicPlugin; import WayofTime.bloodmagic.api.IBloodMagicAPI; import WayofTime.bloodmagic.api.IBloodMagicPlugin; -import WayofTime.bloodmagic.incense.EnumTranquilityType; -import WayofTime.bloodmagic.incense.TranquilityStack; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; import WayofTime.bloodmagic.block.enums.EnumDecorative; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicRecipes; +import WayofTime.bloodmagic.incense.EnumTranquilityType; +import WayofTime.bloodmagic.incense.TranquilityStack; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java index 076c049d..6b06b090 100644 --- a/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCraftingNew.java @@ -17,7 +17,7 @@ public class AlchemyArrayEffectCraftingNew extends AlchemyArrayEffect { public AlchemyArrayEffectCraftingNew(String key, RecipeAlchemyArray recipeAlchemyArray) { super(key); - + this.recipe = recipeAlchemyArray; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 9af126b3..7d286cd3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 553f791c..92fae1bf 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.incense.IIncensePath; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumPath; +import WayofTime.bloodmagic.incense.IIncensePath; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java index fe451eb0..ce5ec8a6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray; import com.google.common.collect.Lists; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index e50f80cf..a7d3a22d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.apibutnotreally.Constants; -import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java index 3900f95e..e4bf0264 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; import javax.annotation.Nonnull; -import java.util.List; public class DataProviderMimic implements IWailaDataProvider { diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 48937522..ba331b03 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -42,7 +42,7 @@ public class RegistrarBloodMagicRecipes { ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); - ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); + ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index 7b2bb804..73972287 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -47,8 +47,7 @@ public class ItemActivationCrystal extends ItemEnum.Variant { REINFORCED, IMBUED, DEMONIC, - ETHEREAL, - ; + ETHEREAL,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 37a765fe..8f9a0cdc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -90,8 +90,7 @@ public class ItemTelepositionFocus extends ItemEnum.Variant CORROSIVE, DESTRUCTIVE, VENGEFUL, - STEADFAST, - ; + STEADFAST,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java index c49aa09b..89474201 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ComponentTypes.java @@ -40,8 +40,7 @@ public enum ComponentTypes implements ISubItem { CATALYST_POWER_1, REAGENT_CLAW, REAGENT_BOUNCE, - REAGENT_FROST, - ; + REAGENT_FROST,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java index d3edd6e3..f3ca9233 100644 --- a/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java +++ b/src/main/java/WayofTime/bloodmagic/item/types/ShardType.java @@ -9,8 +9,7 @@ import java.util.Locale; public enum ShardType implements ISubItem { WEAK, - DEMONIC, - ; + DEMONIC,; @Nonnull @Override diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index 0a9f94d7..392a6386 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.potion; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index db223ce5..de382992 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -6,7 +6,10 @@ import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; -import WayofTime.bloodmagic.apibutnotreally.registry.*; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; @@ -36,7 +39,10 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class ModRecipes { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index 537b8fc7..4e71364d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 9e42209c..2bac524c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 1f55d2f8..794bb119 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -23,7 +23,7 @@ import java.util.Map; public class RitualMagnetic extends Ritual { public static final String PLACEMENT_RANGE = "placementRange"; private static final Map oreBlockCache = new HashMap(); -// public static final String SEARCH_RANGE = "searchRange"; + // public static final String SEARCH_RANGE = "searchRange"; public BlockPos lastPos; // An offset public RitualMagnetic() { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index 86eaf30a..bda9622f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 51afef15..bae862d0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,12 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.incense.EnumTranquilityType; -import WayofTime.bloodmagic.incense.IIncensePath; -import WayofTime.bloodmagic.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.incense.TranquilityStack; import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.incense.IncenseAltarHandler; +import WayofTime.bloodmagic.incense.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 5ff4bd36..e11ccb24 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -185,8 +185,8 @@ public class ChatUtil { /** * @author tterrag1098 - *

- * Ripped from EnderCore (and slightly altered) + *

+ * Ripped from EnderCore (and slightly altered) */ public static class PacketNoSpamChat implements IMessage { private ITextComponent[] chatLines; diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 19d1e886..fa590b7e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -49,7 +49,10 @@ import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.UUID; public class Utils { public static float addAbsorptionToMaximum(EntityLivingBase entity, float added, int maximum, int duration) { @@ -952,7 +955,7 @@ public class Utils { double reachDistance = 5.0D; if (player instanceof EntityPlayerMP) - reachDistance = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance(); + reachDistance = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance(); Vec3d reachPosition = eyePosition.addVector((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 0dae83b8..e75009fe 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; @@ -14,7 +15,6 @@ import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import WayofTime.bloodmagic.apibutnotreally.util.helper.*; -import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems;