From 2b940fdd036f5494f6ffaf0dda9fd6fd51a079c9 Mon Sep 17 00:00:00 2001 From: bombcar Date: Tue, 9 Jan 2024 05:46:20 -0600 Subject: [PATCH] spotless apply for jenkins --- build.gradle | 4 +- dependencies.gradle | 10 ++--- repositories.gradle | 14 ------- .../fox/spiteful/forbidden/DarkAspects.java | 4 +- .../spiteful/forbidden/DarkResearchItem.java | 4 +- .../spiteful/forbidden/FMEventHandler.java | 31 +++++++++------ .../fox/spiteful/forbidden/Forbidden.java | 2 +- .../spiteful/forbidden/ForbiddenRecipes.java | 10 ++--- .../spiteful/forbidden/ForbiddenResearch.java | 6 +-- .../forbidden/VillagerHereticManager.java | 4 +- .../forbidden/blocks/BlockArcaneCake.java | 6 +-- .../forbidden/blocks/BlockLeavesTainted.java | 4 +- .../forbidden/blocks/BlockLogTainted.java | 4 +- .../forbidden/blocks/BlockPlanksTainted.java | 2 +- .../forbidden/blocks/BlockSaplingTainted.java | 4 +- .../forbidden/blocks/BlockStoneTainted.java | 2 +- .../spiteful/forbidden/compat/BloodMagic.java | 18 ++++----- .../fox/spiteful/forbidden/compat/Compat.java | 18 +++++---- .../forbidden/compat/ForbiddenBotany.java | 16 ++++---- .../forbidden/compat/RitualSanity.java | 4 +- .../enchantments/DarkEnchantments.java | 4 +- .../forbidden/items/ForbiddenItems.java | 39 +++++++++++++++---- .../forbidden/items/ItemDivineOrb.java | 2 +- .../forbidden/items/ItemFruitTainted.java | 6 +-- .../forbidden/items/ItemMobCrystal.java | 2 +- .../items/baubles/ItemRingNutrition.java | 4 +- .../items/baubles/ItemSubCollar.java | 6 +-- .../items/scribes/ItemBloodwell.java | 4 +- .../items/scribes/ItemBoundwell.java | 10 ++--- .../items/scribes/ItemCrystalwell.java | 6 +-- .../items/scribes/ItemPrimewell.java | 4 +- .../items/tools/ItemBloodRapier.java | 6 +-- .../items/tools/ItemDiabolistFork.java | 2 +- .../forbidden/items/tools/ItemMorphAxe.java | 4 +- .../items/tools/ItemMorphPickaxe.java | 6 +-- .../items/tools/ItemMorphShovel.java | 6 +-- .../forbidden/items/tools/ItemMorphSword.java | 4 +- .../forbidden/items/tools/ItemSkullAxe.java | 2 +- .../items/tools/ItemTaintPickaxe.java | 2 +- .../items/tools/ItemTaintShovel.java | 6 +-- .../items/wands/BloodStaffUpdate.java | 6 +-- .../items/wands/BloodWandUpdate.java | 6 +-- .../forbidden/items/wands/ItemFocusBlink.java | 18 +++++---- .../forbidden/items/wands/ItemWandCores.java | 10 ++--- .../items/wands/ManaStaffUpdate.java | 6 +-- .../forbidden/items/wands/ManaWandUpdate.java | 6 +-- .../items/wands/YandereWandUpdate.java | 4 +- .../forbidden/tiles/TileEntityWrathCage.java | 4 +- .../forbidden/tiles/WrathSpawnerLogic.java | 4 +- 49 files changed, 191 insertions(+), 165 deletions(-) diff --git a/build.gradle b/build.gradle index 952a3c5..3eb19a2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1704650211 +//version: 1704751096 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -786,7 +786,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} diff --git a/dependencies.gradle b/dependencies.gradle index 4bab1ff..72adceb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,13 +1,13 @@ // Add your dependencies here dependencies { - compile('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') + api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') + api('com.github.GTNewHorizons:Baubles:1.0.3:dev') - compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') + compileOnly('com.github.GTNewHorizons:BloodMagic:1.4.3:dev') + compileOnly('com.github.GTNewHorizons:Botania:1.10.3-GTNH:api') + compileOnly("com.github.GTNewHorizons:AppleCore:3.2.12:dev") - compileOnly('com.github.GTNewHorizons:BloodMagic:1.4.1:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:Botania:1.9.9-GTNH:api') {transitive=false} - compileOnly("com.github.GTNewHorizons:AppleCore:3.2.1:dev") {transitive = false} compileOnly('curse.maven:ee3-65509:2305023') } diff --git a/repositories.gradle b/repositories.gradle index 65c3bbc..c227b16 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,18 +1,4 @@ // Add any additional repositories for your dependencies here repositories { - maven { - name 'GTNH Maven' - url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/' - allowInsecureProtocol - } - maven { - url 'https://cursemaven.com' - content { - includeGroup 'curse.maven' - } - } - maven { - url 'https://jitpack.io' - } } diff --git a/src/main/java/fox/spiteful/forbidden/DarkAspects.java b/src/main/java/fox/spiteful/forbidden/DarkAspects.java index 1c496c8..574780b 100644 --- a/src/main/java/fox/spiteful/forbidden/DarkAspects.java +++ b/src/main/java/fox/spiteful/forbidden/DarkAspects.java @@ -8,12 +8,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; +import fox.spiteful.forbidden.blocks.ForbiddenBlocks; +import fox.spiteful.forbidden.items.ForbiddenItems; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import fox.spiteful.forbidden.blocks.ForbiddenBlocks; -import fox.spiteful.forbidden.items.ForbiddenItems; public class DarkAspects { diff --git a/src/main/java/fox/spiteful/forbidden/DarkResearchItem.java b/src/main/java/fox/spiteful/forbidden/DarkResearchItem.java index 1c618f1..c77be66 100644 --- a/src/main/java/fox/spiteful/forbidden/DarkResearchItem.java +++ b/src/main/java/fox/spiteful/forbidden/DarkResearchItem.java @@ -4,10 +4,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchItem; public class DarkResearchItem extends ResearchItem { diff --git a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java index 2d18344..7289f10 100644 --- a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java +++ b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java @@ -1,6 +1,10 @@ package fox.spiteful.forbidden; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; @@ -23,7 +27,10 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -31,8 +38,11 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; import net.minecraftforge.event.entity.player.PlayerUseItemEvent; @@ -41,16 +51,10 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.Level; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.entities.ITaintedMob; -import thaumcraft.common.config.ConfigItems; -import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.lib.utils.Utils; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import baubles.api.BaublesApi; - import com.google.common.collect.Multimap; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import baubles.api.BaublesApi; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; @@ -62,6 +66,11 @@ import fox.spiteful.forbidden.items.baubles.ItemSubCollar; import fox.spiteful.forbidden.items.tools.ItemRidingCrop; import fox.spiteful.forbidden.items.tools.ItemTaintPickaxe; import fox.spiteful.forbidden.potions.DarkPotions; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.entities.ITaintedMob; +import thaumcraft.common.config.ConfigItems; +import thaumcraft.common.items.wands.ItemWandCasting; +import thaumcraft.common.lib.utils.Utils; public class FMEventHandler { diff --git a/src/main/java/fox/spiteful/forbidden/Forbidden.java b/src/main/java/fox/spiteful/forbidden/Forbidden.java index 5e7c9d5..1a5179d 100644 --- a/src/main/java/fox/spiteful/forbidden/Forbidden.java +++ b/src/main/java/fox/spiteful/forbidden/Forbidden.java @@ -5,7 +5,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; -import thaumcraft.api.wands.WandTriggerRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -20,6 +19,7 @@ import fox.spiteful.forbidden.compat.Compat; import fox.spiteful.forbidden.enchantments.DarkEnchantments; import fox.spiteful.forbidden.items.ForbiddenItems; import fox.spiteful.forbidden.potions.DarkPotions; +import thaumcraft.api.wands.WandTriggerRegistry; @Mod( modid = "ForbiddenMagic", diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java index 7d36b5f..dd458d4 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java @@ -8,17 +8,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.forbidden.blocks.ForbiddenBlocks; +import fox.spiteful.forbidden.enchantments.DarkEnchantments; +import fox.spiteful.forbidden.items.ForbiddenItems; import thaumcraft.api.ItemApi; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import fox.spiteful.forbidden.blocks.ForbiddenBlocks; -import fox.spiteful.forbidden.enchantments.DarkEnchantments; -import fox.spiteful.forbidden.items.ForbiddenItems; public class ForbiddenRecipes { diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java index c8e3a9b..0e1c967 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java @@ -7,6 +7,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; +import fox.spiteful.forbidden.blocks.ForbiddenBlocks; +import fox.spiteful.forbidden.compat.Compat; +import fox.spiteful.forbidden.items.ForbiddenItems; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -16,9 +19,6 @@ import thaumcraft.api.crafting.InfusionEnchantmentRecipe; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchPage; -import fox.spiteful.forbidden.blocks.ForbiddenBlocks; -import fox.spiteful.forbidden.compat.Compat; -import fox.spiteful.forbidden.items.ForbiddenItems; public class ForbiddenResearch { diff --git a/src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java b/src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java index 4b561cf..78f94f0 100644 --- a/src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java +++ b/src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java @@ -8,14 +8,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; +import fox.spiteful.forbidden.items.ForbiddenItems; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; -import fox.spiteful.forbidden.items.ForbiddenItems; public class VillagerHereticManager implements IVillageTradeHandler { diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java index 92ae56a..70d9eee 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java @@ -14,13 +14,13 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import squeek.applecore.api.food.FoodValues; -import squeek.applecore.api.food.IEdibleBlock; -import squeek.applecore.api.food.ItemFoodProxy; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import squeek.applecore.api.food.FoodValues; +import squeek.applecore.api.food.IEdibleBlock; +import squeek.applecore.api.food.ItemFoodProxy; @Optional.Interface(iface = "squeek.applecore.api.food.IEdibleBlock", modid = "AppleCore") public class BlockArcaneCake extends Block implements IEdibleBlock { diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockLeavesTainted.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockLeavesTainted.java index 718428d..ade99ab 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockLeavesTainted.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockLeavesTainted.java @@ -13,13 +13,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import thaumcraft.common.config.Config; -import thaumcraft.common.config.ConfigBlocks; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.items.ForbiddenItems; +import thaumcraft.common.config.Config; +import thaumcraft.common.config.ConfigBlocks; public class BlockLeavesTainted extends BlockLeaves { diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockLogTainted.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockLogTainted.java index 3f62acf..fa5fce3 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockLogTainted.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockLogTainted.java @@ -9,12 +9,12 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import thaumcraft.common.config.Config; -import thaumcraft.common.config.ConfigBlocks; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.common.config.Config; +import thaumcraft.common.config.ConfigBlocks; public class BlockLogTainted extends BlockLog { diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockPlanksTainted.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockPlanksTainted.java index ebcd3cd..935aa5c 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockPlanksTainted.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockPlanksTainted.java @@ -2,8 +2,8 @@ package fox.spiteful.forbidden.blocks; import net.minecraft.block.Block; -import thaumcraft.common.config.Config; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.common.config.Config; public class BlockPlanksTainted extends Block { diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockSaplingTainted.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockSaplingTainted.java index 64032bc..027c9d5 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockSaplingTainted.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockSaplingTainted.java @@ -13,13 +13,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import thaumcraft.common.config.Config; -import thaumcraft.common.config.ConfigBlocks; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.WorldGenTaintedTree; +import thaumcraft.common.config.Config; +import thaumcraft.common.config.ConfigBlocks; public class BlockSaplingTainted extends BlockSapling { diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockStoneTainted.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockStoneTainted.java index e978c03..e0b00fc 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockStoneTainted.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockStoneTainted.java @@ -9,10 +9,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import thaumcraft.common.config.Config; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.common.config.Config; public class BlockStoneTainted extends Block { diff --git a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java index 55b548e..5fada20 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java +++ b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java @@ -8,15 +8,6 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.Level; -import thaumcraft.api.ItemApi; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.IArcaneRecipe; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.potions.PotionFluxTaint; -import thaumcraft.api.research.ResearchPage; -import thaumcraft.common.config.ConfigItems; import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; @@ -28,6 +19,15 @@ import fox.spiteful.forbidden.DarkResearchItem; import fox.spiteful.forbidden.LogHandler; import fox.spiteful.forbidden.items.ForbiddenItems; import fox.spiteful.forbidden.potions.DarkPotions; +import thaumcraft.api.ItemApi; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.IArcaneRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.potions.PotionFluxTaint; +import thaumcraft.api.research.ResearchPage; +import thaumcraft.common.config.ConfigItems; public class BloodMagic { diff --git a/src/main/java/fox/spiteful/forbidden/compat/Compat.java b/src/main/java/fox/spiteful/forbidden/compat/Compat.java index 1279d85..b20ed38 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/Compat.java +++ b/src/main/java/fox/spiteful/forbidden/compat/Compat.java @@ -7,6 +7,16 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.Level; +import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.forbidden.Config; +import fox.spiteful.forbidden.DarkAspects; +import fox.spiteful.forbidden.DarkResearchItem; +import fox.spiteful.forbidden.LogHandler; +import fox.spiteful.forbidden.blocks.ForbiddenBlocks; +import fox.spiteful.forbidden.items.ForbiddenItems; import thaumcraft.api.ItemApi; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; @@ -17,14 +27,6 @@ import thaumcraft.api.research.ResearchPage; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import fox.spiteful.forbidden.*; -import fox.spiteful.forbidden.blocks.ForbiddenBlocks; -import fox.spiteful.forbidden.items.ForbiddenItems; - public class Compat { public static boolean tt = false; diff --git a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java index abbb333..97ef9b2 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java +++ b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java @@ -14,14 +14,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import org.apache.logging.log4j.Level; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.IArcaneRecipe; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.research.ResearchPage; -import thaumcraft.common.config.ConfigItems; -import vazkii.botania.api.BotaniaAPI; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.forbidden.Config; @@ -32,6 +24,14 @@ import fox.spiteful.forbidden.tiles.SubTileBloodthorn; import fox.spiteful.forbidden.tiles.SubTileEuclidaisy; import fox.spiteful.forbidden.tiles.SubTileTainthistle; import fox.spiteful.forbidden.tiles.SubTileWhisperweed; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.IArcaneRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.research.ResearchPage; +import thaumcraft.common.config.ConfigItems; +import vazkii.botania.api.BotaniaAPI; public class ForbiddenBotany { diff --git a/src/main/java/fox/spiteful/forbidden/compat/RitualSanity.java b/src/main/java/fox/spiteful/forbidden/compat/RitualSanity.java index b88d06f..960d807 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/RitualSanity.java +++ b/src/main/java/fox/spiteful/forbidden/compat/RitualSanity.java @@ -8,13 +8,13 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.lib.potions.PotionWarpWard; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.lib.potions.PotionWarpWard; public class RitualSanity extends RitualEffect { diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java b/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java index 805fa73..24c1ed8 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java +++ b/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java @@ -4,10 +4,10 @@ import java.lang.reflect.Method; import net.minecraft.enchantment.Enchantment; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; public class DarkEnchantments { diff --git a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java index 59db967..6492ca7 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java +++ b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java @@ -9,6 +9,38 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.forbidden.Config; +import fox.spiteful.forbidden.compat.Compat; +import fox.spiteful.forbidden.items.baubles.ItemRingNutrition; +import fox.spiteful.forbidden.items.baubles.ItemSubCollar; +import fox.spiteful.forbidden.items.scribes.ItemBloodwell; +import fox.spiteful.forbidden.items.scribes.ItemBoundwell; +import fox.spiteful.forbidden.items.scribes.ItemCrystalwell; +import fox.spiteful.forbidden.items.scribes.ItemPrimewell; +import fox.spiteful.forbidden.items.tools.ItemBloodRapier; +import fox.spiteful.forbidden.items.tools.ItemDiabolistFork; +import fox.spiteful.forbidden.items.tools.ItemMorphAxe; +import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe; +import fox.spiteful.forbidden.items.tools.ItemMorphShovel; +import fox.spiteful.forbidden.items.tools.ItemMorphSword; +import fox.spiteful.forbidden.items.tools.ItemRidingCrop; +import fox.spiteful.forbidden.items.tools.ItemSkullAxe; +import fox.spiteful.forbidden.items.tools.ItemTaintPickaxe; +import fox.spiteful.forbidden.items.tools.ItemTaintShovel; +import fox.spiteful.forbidden.items.wands.BloodStaffUpdate; +import fox.spiteful.forbidden.items.wands.BloodWandUpdate; +import fox.spiteful.forbidden.items.wands.CreativeWandUpdate; +import fox.spiteful.forbidden.items.wands.DarkWandCap; +import fox.spiteful.forbidden.items.wands.InfernalWandUpdate; +import fox.spiteful.forbidden.items.wands.ItemFocusBlink; +import fox.spiteful.forbidden.items.wands.ItemWandCaps; +import fox.spiteful.forbidden.items.wands.ItemWandCores; +import fox.spiteful.forbidden.items.wands.ManaStaffUpdate; +import fox.spiteful.forbidden.items.wands.ManaWandUpdate; +import fox.spiteful.forbidden.items.wands.ProfaneWandUpdate; +import fox.spiteful.forbidden.items.wands.TaintedWandUpdate; +import fox.spiteful.forbidden.items.wands.YandereWandUpdate; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -16,13 +48,6 @@ import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.StaffRod; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; -import cpw.mods.fml.common.registry.GameRegistry; -import fox.spiteful.forbidden.Config; -import fox.spiteful.forbidden.compat.Compat; -import fox.spiteful.forbidden.items.baubles.*; -import fox.spiteful.forbidden.items.scribes.*; -import fox.spiteful.forbidden.items.tools.*; -import fox.spiteful.forbidden.items.wands.*; public class ForbiddenItems { diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java index 188b934..a2fa885 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java @@ -12,7 +12,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import thaumcraft.api.IWarpingGear; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; @@ -21,6 +20,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.IWarpingGear; public class ItemDivineOrb extends Item implements IBloodOrb, IBindable, IWarpingGear { diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemFruitTainted.java b/src/main/java/fox/spiteful/forbidden/items/ItemFruitTainted.java index 0d74b21..0d0ce3d 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemFruitTainted.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemFruitTainted.java @@ -12,12 +12,12 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import thaumcraft.api.potions.PotionFluxTaint; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.lib.potions.PotionThaumarhia; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.api.potions.PotionFluxTaint; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.lib.potions.PotionThaumarhia; public class ItemFruitTainted extends ItemFood { diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMobCrystal.java b/src/main/java/fox/spiteful/forbidden/items/ItemMobCrystal.java index dace83c..473be16 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMobCrystal.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemMobCrystal.java @@ -11,11 +11,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.Aspect; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.api.aspects.Aspect; public class ItemMobCrystal extends Item { diff --git a/src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java b/src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java index ee5bde3..6dea839 100644 --- a/src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java +++ b/src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java @@ -12,8 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import thaumcraft.api.IRunicArmor; -import vazkii.botania.api.item.ICosmeticAttachable; import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; @@ -21,6 +19,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.IRunicArmor; +import vazkii.botania.api.item.ICosmeticAttachable; @Optional.Interface(iface = "vazkii.botania.api.item.ICosmeticAttachable", modid = "Botania") public class ItemRingNutrition extends Item implements IRunicArmor, IBauble, ICosmeticAttachable { diff --git a/src/main/java/fox/spiteful/forbidden/items/baubles/ItemSubCollar.java b/src/main/java/fox/spiteful/forbidden/items/baubles/ItemSubCollar.java index 8a8b62e..9ebabf4 100644 --- a/src/main/java/fox/spiteful/forbidden/items/baubles/ItemSubCollar.java +++ b/src/main/java/fox/spiteful/forbidden/items/baubles/ItemSubCollar.java @@ -19,15 +19,15 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.common.items.baubles.ItemAmuletVis; -import vazkii.botania.api.item.ICosmeticAttachable; import baubles.api.BaublesApi; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.items.baubles.ItemAmuletVis; +import vazkii.botania.api.item.ICosmeticAttachable; @Optional.Interface(iface = "vazkii.botania.api.item.ICosmeticAttachable", modid = "Botania") public class ItemSubCollar extends ItemAmuletVis implements ICosmeticAttachable { diff --git a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBloodwell.java b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBloodwell.java index e9ba817..9e2e6f7 100644 --- a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBloodwell.java +++ b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBloodwell.java @@ -10,14 +10,14 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import thaumcraft.api.IScribeTools; -import thaumcraft.common.items.ItemInkwell; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.IScribeTools; +import thaumcraft.common.items.ItemInkwell; public class ItemBloodwell extends ItemInkwell implements IScribeTools, IBindable { diff --git a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBoundwell.java b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBoundwell.java index f088d77..2f021c7 100644 --- a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBoundwell.java +++ b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBoundwell.java @@ -11,6 +11,11 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.forbidden.Forbidden; import thaumcraft.api.IScribeTools; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.Thaumcraft; @@ -18,11 +23,6 @@ import thaumcraft.common.items.ItemInkwell; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.playerdata.PacketAspectPool; import thaumcraft.common.lib.research.ResearchManager; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fox.spiteful.forbidden.Forbidden; public class ItemBoundwell extends ItemInkwell implements IScribeTools, IBindable { diff --git a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemCrystalwell.java b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemCrystalwell.java index 8c58245..cb3a3de 100644 --- a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemCrystalwell.java +++ b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemCrystalwell.java @@ -10,6 +10,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.forbidden.Forbidden; import thaumcraft.api.IScribeTools; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.Thaumcraft; @@ -19,9 +22,6 @@ import thaumcraft.common.items.ItemInkwell; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.playerdata.PacketAspectPool; import thaumcraft.common.lib.research.ResearchManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fox.spiteful.forbidden.Forbidden; public class ItemCrystalwell extends ItemInkwell implements IScribeTools { diff --git a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemPrimewell.java b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemPrimewell.java index 3cfc1ac..0d8f8b2 100644 --- a/src/main/java/fox/spiteful/forbidden/items/scribes/ItemPrimewell.java +++ b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemPrimewell.java @@ -5,11 +5,11 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import thaumcraft.api.IScribeTools; -import thaumcraft.common.items.ItemInkwell; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.api.IScribeTools; +import thaumcraft.common.items.ItemInkwell; public class ItemPrimewell extends ItemInkwell implements IScribeTools { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemBloodRapier.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemBloodRapier.java index c7fca14..ba47515 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemBloodRapier.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemBloodRapier.java @@ -12,14 +12,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.EnumHelper; -import thaumcraft.api.IRepairable; -import thaumcraft.api.IWarpingGear; -import thaumcraft.common.config.ConfigItems; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.compat.Compat; import fox.spiteful.forbidden.potions.DarkPotions; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IWarpingGear; +import thaumcraft.common.config.ConfigItems; public class ItemBloodRapier extends ItemSword implements IRepairable, IWarpingGear { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemDiabolistFork.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemDiabolistFork.java index af544b3..2e7c66a 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemDiabolistFork.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemDiabolistFork.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import thaumcraft.api.IRepairable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.api.IRepairable; public class ItemDiabolistFork extends ItemSword implements IRepairable { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphAxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphAxe.java index 68232d5..321714a 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphAxe.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphAxe.java @@ -13,13 +13,13 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import thaumcraft.api.IRepairable; -import thaumcraft.api.IWarpingGear; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.enchantments.DarkEnchantments; import fox.spiteful.forbidden.items.ForbiddenItems; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IWarpingGear; public class ItemMorphAxe extends ItemAxe implements IRepairable, IWarpingGear { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java index 0740158..aabfdfa 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java @@ -16,14 +16,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import thaumcraft.api.IRepairable; -import thaumcraft.api.IWarpingGear; -import thaumcraft.common.lib.utils.BlockUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.enchantments.DarkEnchantments; import fox.spiteful.forbidden.items.ForbiddenItems; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IWarpingGear; +import thaumcraft.common.lib.utils.BlockUtils; public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpingGear { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java index 65e434b..026c588 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java @@ -16,14 +16,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import thaumcraft.api.IRepairable; -import thaumcraft.api.IWarpingGear; -import thaumcraft.common.lib.utils.BlockUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.enchantments.DarkEnchantments; import fox.spiteful.forbidden.items.ForbiddenItems; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IWarpingGear; +import thaumcraft.common.lib.utils.BlockUtils; public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingGear { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphSword.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphSword.java index 0556654..939e165 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphSword.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphSword.java @@ -13,13 +13,13 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import thaumcraft.api.IRepairable; -import thaumcraft.api.IWarpingGear; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.enchantments.DarkEnchantments; import fox.spiteful.forbidden.items.ForbiddenItems; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IWarpingGear; public class ItemMorphSword extends ItemSword implements IRepairable, IWarpingGear { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemSkullAxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemSkullAxe.java index f79330d..4401520 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemSkullAxe.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemSkullAxe.java @@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.IIcon; -import thaumcraft.api.IRepairable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.api.IRepairable; public class ItemSkullAxe extends ItemSword implements IRepairable { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintPickaxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintPickaxe.java index 87e3dd0..e8f4b08 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintPickaxe.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintPickaxe.java @@ -6,11 +6,11 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import thaumcraft.api.IRepairable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.Forbidden; +import thaumcraft.api.IRepairable; public class ItemTaintPickaxe extends ItemPickaxe implements IRepairable { diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintShovel.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintShovel.java index f3ef3fa..f42cc1e 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintShovel.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintShovel.java @@ -10,14 +10,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import thaumcraft.api.IRepairable; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.config.ConfigBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.blocks.ForbiddenBlocks; +import thaumcraft.api.IRepairable; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.config.ConfigBlocks; public class ItemTaintShovel extends ItemSpade implements IRepairable { diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java index 44254c5..72d450f 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java @@ -4,12 +4,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.wands.IWandRodOnUpdate; -import thaumcraft.common.items.wands.ItemWandCasting; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.IWandRodOnUpdate; +import thaumcraft.common.items.wands.ItemWandCasting; public class BloodStaffUpdate implements IWandRodOnUpdate { diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java index d821aaa..54085f0 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java @@ -3,12 +3,12 @@ package fox.spiteful.forbidden.items.wands; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.wands.IWandRodOnUpdate; -import thaumcraft.common.items.wands.ItemWandCasting; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.IWandRodOnUpdate; +import thaumcraft.common.items.wands.ItemWandCasting; public class BloodWandUpdate implements IWandRodOnUpdate { diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemFocusBlink.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemFocusBlink.java index d500791..730345c 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemFocusBlink.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemFocusBlink.java @@ -7,21 +7,25 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EntityDamageSource; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.FocusUpgradeType; -import thaumcraft.api.wands.ItemFocusBasic; -import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.lib.utils.BlockUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.DarkAspects; import fox.spiteful.forbidden.Forbidden; import fox.spiteful.forbidden.items.ForbiddenItems; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.FocusUpgradeType; +import thaumcraft.api.wands.ItemFocusBasic; +import thaumcraft.common.items.wands.ItemWandCasting; +import thaumcraft.common.lib.utils.BlockUtils; public class ItemFocusBlink extends ItemFocusBasic { diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java index 856e51a..7abb3b2 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java @@ -8,17 +8,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.forbidden.Config; +import fox.spiteful.forbidden.Forbidden; +import fox.spiteful.forbidden.compat.Compat; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fox.spiteful.forbidden.Config; -import fox.spiteful.forbidden.Forbidden; -import fox.spiteful.forbidden.compat.Compat; public class ItemWandCores extends Item { diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ManaStaffUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/ManaStaffUpdate.java index 27cbf57..62b1529 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ManaStaffUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ManaStaffUpdate.java @@ -3,13 +3,13 @@ package fox.spiteful.forbidden.items.wands; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.wands.IWandRodOnUpdate; -import thaumcraft.common.items.wands.ItemWandCasting; import am2.api.ArsMagicaApi; import am2.api.IExtendedProperties; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.IWandRodOnUpdate; +import thaumcraft.common.items.wands.ItemWandCasting; public class ManaStaffUpdate implements IWandRodOnUpdate { diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java index 32232c6..fcf8410 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ManaWandUpdate.java @@ -3,13 +3,13 @@ package fox.spiteful.forbidden.items.wands; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.wands.IWandRodOnUpdate; -import thaumcraft.common.items.wands.ItemWandCasting; import am2.api.ArsMagicaApi; import am2.api.IExtendedProperties; import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.compat.Compat; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.IWandRodOnUpdate; +import thaumcraft.common.items.wands.ItemWandCasting; public class ManaWandUpdate implements IWandRodOnUpdate { diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java index 75f53e1..605e940 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/YandereWandUpdate.java @@ -3,12 +3,12 @@ package fox.spiteful.forbidden.items.wands; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import fox.spiteful.forbidden.Config; +import fox.spiteful.forbidden.compat.Compat; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.wands.IWandRodOnUpdate; import thaumcraft.common.items.wands.ItemWandCasting; import vazkii.botania.api.mana.ManaItemHandler; -import fox.spiteful.forbidden.Config; -import fox.spiteful.forbidden.compat.Compat; public class YandereWandUpdate implements IWandRodOnUpdate { diff --git a/src/main/java/fox/spiteful/forbidden/tiles/TileEntityWrathCage.java b/src/main/java/fox/spiteful/forbidden/tiles/TileEntityWrathCage.java index 0a9e784..e86b3ee 100644 --- a/src/main/java/fox/spiteful/forbidden/tiles/TileEntityWrathCage.java +++ b/src/main/java/fox/spiteful/forbidden/tiles/TileEntityWrathCage.java @@ -7,13 +7,13 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import fox.spiteful.forbidden.Config; +import fox.spiteful.forbidden.DarkAspects; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import fox.spiteful.forbidden.Config; -import fox.spiteful.forbidden.DarkAspects; public class TileEntityWrathCage extends TileEntity implements IAspectContainer, IEssentiaTransport { diff --git a/src/main/java/fox/spiteful/forbidden/tiles/WrathSpawnerLogic.java b/src/main/java/fox/spiteful/forbidden/tiles/WrathSpawnerLogic.java index b954d73..395b85a 100644 --- a/src/main/java/fox/spiteful/forbidden/tiles/WrathSpawnerLogic.java +++ b/src/main/java/fox/spiteful/forbidden/tiles/WrathSpawnerLogic.java @@ -10,11 +10,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.common.Thaumcraft; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.forbidden.Config; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.Thaumcraft; public class WrathSpawnerLogic {