From 1e0613c9490fc3cf4b884bcaafb4129563e48421 Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Fri, 6 Apr 2018 22:53:53 +0100 Subject: [PATCH] Cleanup --- .../java/electroblob/wizardry/WizardData.java | 15 ++-- .../java/electroblob/wizardry/Wizardry.java | 6 +- .../wizardry/WizardryEventHandler.java | 16 +++- .../block/BlockTransportationStone.java | 4 +- .../wizardry/client/GuiArcaneWorkbench.java | 3 +- .../wizardry/command/CommandCastSpell.java | 11 ++- .../command/CommandDiscoverSpell.java | 11 ++- .../entity/construct/EntityTornado.java | 4 +- .../entity/living/EntityEvilWizard.java | 26 ++++-- .../wizardry/entity/living/EntityWizard.java | 39 ++++++-- .../wizardry/item/ItemArcaneTome.java | 6 +- .../wizardry/item/ItemArmourUpgrade.java | 5 +- .../item/ItemIdentificationScroll.java | 8 +- .../wizardry/item/ItemSpellBook.java | 2 - .../electroblob/wizardry/item/ItemWand.java | 8 +- .../wizardry/item/ItemWizardArmour.java | 10 +-- .../wizardry/item/ItemWizardHandbook.java | 5 +- .../registry/WizardryAchievements.java | 44 --------- .../registry/WizardryAdvancementTriggers.java | 26 ++++++ .../wizardry/registry/WizardryItems.java | 7 +- .../wizardry/registry/WizardryRegistry.java | 90 ++++++++++++------- .../wizardry/registry/WizardryTabs.java | 1 - .../wizardry/spell/ArcaneJammer.java | 2 - .../electroblob/wizardry/spell/IceAge.java | 4 +- .../electroblob/wizardry/spell/IceStatue.java | 2 - .../wizardry/spell/LightningBolt.java | 2 - .../electroblob/wizardry/spell/Slime.java | 2 - .../electroblob/wizardry/spell/Spell.java | 12 +-- .../tileentity/ContainerArcaneWorkbench.java | 14 +-- 29 files changed, 217 insertions(+), 168 deletions(-) delete mode 100644 src/main/java/electroblob/wizardry/registry/WizardryAchievements.java diff --git a/src/main/java/electroblob/wizardry/WizardData.java b/src/main/java/electroblob/wizardry/WizardData.java index 98d7cbb4..03ef8f86 100644 --- a/src/main/java/electroblob/wizardry/WizardData.java +++ b/src/main/java/electroblob/wizardry/WizardData.java @@ -1,5 +1,14 @@ package electroblob.wizardry; +import java.lang.ref.WeakReference; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.UUID; + import electroblob.wizardry.constants.Element; import electroblob.wizardry.enchantment.Imbuement; import electroblob.wizardry.entity.EntityShield; @@ -49,10 +58,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import java.lang.ref.WeakReference; -import java.util.*; -import java.util.Map.Entry; - /** * Capability-based replacement for the old ExtendedPlayer class from 1.7.10. This has been reworked to leave minimum * external changes (for my own sanity, mainly!). Turns out the only major difference between an internal capability and @@ -62,7 +67,7 @@ import java.util.Map.Entry; * capability, but in my opinion there are already too many classes to deal with, so I'm not adding any more than are * necessary, meaning those constants and values are kept here instead. * - * @since Wizardry 1.2 + * @since Wizardry 2.1 * @author Electroblob */ // On the plus side, having to rethink this class allowed me to clean it up a lot. diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java index 130374a5..989e5df8 100644 --- a/src/main/java/electroblob/wizardry/Wizardry.java +++ b/src/main/java/electroblob/wizardry/Wizardry.java @@ -1,10 +1,13 @@ package electroblob.wizardry; +import org.apache.logging.log4j.Logger; + import electroblob.wizardry.command.CommandCastSpell; import electroblob.wizardry.command.CommandDiscoverSpell; import electroblob.wizardry.command.CommandSetAlly; import electroblob.wizardry.command.CommandViewAllies; import electroblob.wizardry.packet.WizardryPacketHandler; +import electroblob.wizardry.registry.WizardryAdvancementTriggers; import electroblob.wizardry.registry.WizardryItems; import electroblob.wizardry.registry.WizardryRegistry; import electroblob.wizardry.registry.WizardryTabs; @@ -27,7 +30,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.apache.logging.log4j.Logger; @Mod(modid = Wizardry.MODID, name = Wizardry.NAME, version = Wizardry.VERSION, guiFactory = "electroblob.wizardry.WizardryGuiFactory") public class Wizardry { @@ -136,7 +138,7 @@ public class Wizardry { // The check for the generateLoot setting is now done within this method. WizardryRegistry.registerLoot(); - WizardryRegistry.registerAdvancementTriggers(); + WizardryAdvancementTriggers.register(); // Moved to preInit, because apparently it has to be here now. proxy.registerRenderers(); diff --git a/src/main/java/electroblob/wizardry/WizardryEventHandler.java b/src/main/java/electroblob/wizardry/WizardryEventHandler.java index 7e483d89..ad5bd338 100644 --- a/src/main/java/electroblob/wizardry/WizardryEventHandler.java +++ b/src/main/java/electroblob/wizardry/WizardryEventHandler.java @@ -1,7 +1,5 @@ package electroblob.wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Constants; import electroblob.wizardry.entity.EntityArc; import electroblob.wizardry.entity.living.EntityEvilWizard; @@ -11,11 +9,21 @@ import electroblob.wizardry.event.DiscoverSpellEvent; import electroblob.wizardry.event.SpellCastEvent; import electroblob.wizardry.item.ItemWand; import electroblob.wizardry.item.ItemWizardArmour; -import electroblob.wizardry.registry.*; +import electroblob.wizardry.registry.Spells; +import electroblob.wizardry.registry.WizardryAdvancementTriggers; +import electroblob.wizardry.registry.WizardryEnchantments; +import electroblob.wizardry.registry.WizardryItems; +import electroblob.wizardry.registry.WizardryPotions; +import electroblob.wizardry.registry.WizardrySounds; import electroblob.wizardry.spell.FreezingWeapon; import electroblob.wizardry.spell.Spell; -import electroblob.wizardry.util.*; +import electroblob.wizardry.util.IElementalDamage; +import electroblob.wizardry.util.MagicDamage; import electroblob.wizardry.util.MagicDamage.DamageType; +import electroblob.wizardry.util.SpellModifiers; +import electroblob.wizardry.util.WandHelper; +import electroblob.wizardry.util.WizardryParticleType; +import electroblob.wizardry.util.WizardryUtilities; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/electroblob/wizardry/block/BlockTransportationStone.java b/src/main/java/electroblob/wizardry/block/BlockTransportationStone.java index 8a78d7f4..5a738955 100644 --- a/src/main/java/electroblob/wizardry/block/BlockTransportationStone.java +++ b/src/main/java/electroblob/wizardry/block/BlockTransportationStone.java @@ -1,5 +1,7 @@ package electroblob.wizardry.block; +import java.util.Random; + import electroblob.wizardry.WizardData; import electroblob.wizardry.Wizardry; import electroblob.wizardry.item.ItemWand; @@ -18,8 +20,6 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.Random; - public class BlockTransportationStone extends Block { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0625f * 5, 0, 0.0625f * 5, 0.0625f * 11, 0.0625f * 6, diff --git a/src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java b/src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java index bebacb79..2dc2417e 100644 --- a/src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java +++ b/src/main/java/electroblob/wizardry/client/GuiArcaneWorkbench.java @@ -1,5 +1,7 @@ package electroblob.wizardry.client; +import org.lwjgl.input.Keyboard; + import electroblob.wizardry.SpellGlyphData; import electroblob.wizardry.WizardData; import electroblob.wizardry.Wizardry; @@ -24,7 +26,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import org.lwjgl.input.Keyboard; public class GuiArcaneWorkbench extends GuiContainer { diff --git a/src/main/java/electroblob/wizardry/command/CommandCastSpell.java b/src/main/java/electroblob/wizardry/command/CommandCastSpell.java index a998635d..7dbbde14 100644 --- a/src/main/java/electroblob/wizardry/command/CommandCastSpell.java +++ b/src/main/java/electroblob/wizardry/command/CommandCastSpell.java @@ -1,5 +1,7 @@ package electroblob.wizardry.command; +import java.util.List; + import electroblob.wizardry.WizardData; import electroblob.wizardry.Wizardry; import electroblob.wizardry.event.SpellCastEvent; @@ -8,7 +10,12 @@ import electroblob.wizardry.packet.PacketCastSpell; import electroblob.wizardry.packet.WizardryPacketHandler; import electroblob.wizardry.spell.Spell; import electroblob.wizardry.util.SpellModifiers; -import net.minecraft.command.*; +import net.minecraft.command.CommandBase; +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.command.NumberInvalidException; +import net.minecraft.command.PlayerNotFoundException; +import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.JsonToNBT; @@ -22,8 +29,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import java.util.List; - public class CommandCastSpell extends CommandBase { @Override diff --git a/src/main/java/electroblob/wizardry/command/CommandDiscoverSpell.java b/src/main/java/electroblob/wizardry/command/CommandDiscoverSpell.java index 4e248ada..d97e6470 100644 --- a/src/main/java/electroblob/wizardry/command/CommandDiscoverSpell.java +++ b/src/main/java/electroblob/wizardry/command/CommandDiscoverSpell.java @@ -1,19 +1,24 @@ package electroblob.wizardry.command; +import java.util.List; + import electroblob.wizardry.WizardData; import electroblob.wizardry.Wizardry; import electroblob.wizardry.event.DiscoverSpellEvent; import electroblob.wizardry.registry.Spells; import electroblob.wizardry.spell.Spell; -import net.minecraft.command.*; +import net.minecraft.command.CommandBase; +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.command.NumberInvalidException; +import net.minecraft.command.PlayerNotFoundException; +import net.minecraft.command.WrongUsageException; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.MinecraftForge; -import java.util.List; - public class CommandDiscoverSpell extends CommandBase { @Override diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java b/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java index 87302c74..5f8abcb0 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityTornado.java @@ -1,5 +1,7 @@ package electroblob.wizardry.entity.construct; +import java.util.List; + import electroblob.wizardry.Wizardry; import electroblob.wizardry.registry.WizardryAdvancementTriggers; import electroblob.wizardry.registry.WizardrySounds; @@ -21,8 +23,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; - public class EntityTornado extends EntityMagicConstruct { private double velX, velZ; diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java index 678f553d..30cb09d8 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityEvilWizard.java @@ -1,6 +1,12 @@ package electroblob.wizardry.entity.living; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + import com.google.common.base.Predicate; + import electroblob.wizardry.Wizardry; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.Tier; @@ -14,8 +20,19 @@ import electroblob.wizardry.util.SpellModifiers; import electroblob.wizardry.util.WizardryParticleType; import electroblob.wizardry.util.WizardryUtilities; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction; +import net.minecraft.entity.ai.EntityAINearestAttackableTarget; +import net.minecraft.entity.ai.EntityAIOpenDoor; +import net.minecraft.entity.ai.EntityAIRestrictOpenDoor; +import net.minecraft.entity.ai.EntityAISwimming; +import net.minecraft.entity.ai.EntityAIWander; +import net.minecraft.entity.ai.EntityAIWatchClosest2; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -36,11 +53,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - public class EntityEvilWizard extends EntityMob implements ISpellCaster, IEntityAdditionalSpawnData { private EntityAIAttackSpell spellCastingAI = new EntityAIAttackSpell(this, 0.5D, 14.0F, 30, 50); diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java index e27a9e80..7f8b5cc1 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityWizard.java @@ -1,21 +1,48 @@ package electroblob.wizardry.entity.living; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Random; +import java.util.Set; + import com.google.common.base.Predicate; + import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.Tier; import electroblob.wizardry.item.ItemSpellBook; -import electroblob.wizardry.registry.*; +import electroblob.wizardry.registry.Spells; +import electroblob.wizardry.registry.WizardryAdvancementTriggers; +import electroblob.wizardry.registry.WizardryItems; +import electroblob.wizardry.registry.WizardryPotions; +import electroblob.wizardry.registry.WizardrySounds; import electroblob.wizardry.spell.Spell; import electroblob.wizardry.util.SpellModifiers; import electroblob.wizardry.util.WandHelper; import electroblob.wizardry.util.WizardryParticleType; import electroblob.wizardry.util.WizardryUtilities; import io.netty.buffer.ByteBuf; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityAgeable; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILookAtTradePlayer; +import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction; +import net.minecraft.entity.ai.EntityAINearestAttackableTarget; +import net.minecraft.entity.ai.EntityAIOpenDoor; +import net.minecraft.entity.ai.EntityAIRestrictOpenDoor; +import net.minecraft.entity.ai.EntityAISwimming; +import net.minecraft.entity.ai.EntityAITradePlayer; +import net.minecraft.entity.ai.EntityAIWander; +import net.minecraft.entity.ai.EntityAIWatchClosest; +import net.minecraft.entity.ai.EntityAIWatchClosest2; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.EntityVillager; @@ -53,8 +80,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import java.util.*; - @Mod.EventBusSubscriber public class EntityWizard extends EntityVillager implements ISpellCaster, IEntityAdditionalSpawnData { diff --git a/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java b/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java index 6a55c996..07b0406d 100644 --- a/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java +++ b/src/main/java/electroblob/wizardry/item/ItemArcaneTome.java @@ -1,9 +1,10 @@ package electroblob.wizardry.item; +import java.util.List; + import electroblob.wizardry.Wizardry; import electroblob.wizardry.constants.Tier; import electroblob.wizardry.registry.WizardryTabs; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -14,9 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; - public class ItemArcaneTome extends Item { public ItemArcaneTome(){ diff --git a/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java b/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java index b058bf9d..39eaef6e 100644 --- a/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java +++ b/src/main/java/electroblob/wizardry/item/ItemArmourUpgrade.java @@ -2,9 +2,10 @@ package electroblob.wizardry.item; import java.util.List; +import javax.annotation.Nullable; + import electroblob.wizardry.Wizardry; import electroblob.wizardry.registry.WizardryTabs; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -13,8 +14,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; - public class ItemArmourUpgrade extends Item { public ItemArmourUpgrade(){ diff --git a/src/main/java/electroblob/wizardry/item/ItemIdentificationScroll.java b/src/main/java/electroblob/wizardry/item/ItemIdentificationScroll.java index c87c076f..8a560c5b 100644 --- a/src/main/java/electroblob/wizardry/item/ItemIdentificationScroll.java +++ b/src/main/java/electroblob/wizardry/item/ItemIdentificationScroll.java @@ -1,5 +1,9 @@ package electroblob.wizardry.item; +import java.util.List; + +import javax.annotation.Nullable; + import electroblob.wizardry.WizardData; import electroblob.wizardry.Wizardry; import electroblob.wizardry.event.DiscoverSpellEvent; @@ -7,7 +11,6 @@ import electroblob.wizardry.registry.WizardryAdvancementTriggers; import electroblob.wizardry.registry.WizardryTabs; import electroblob.wizardry.spell.Spell; import electroblob.wizardry.util.WizardryUtilities; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -22,9 +25,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; - public class ItemIdentificationScroll extends Item { public ItemIdentificationScroll(){ diff --git a/src/main/java/electroblob/wizardry/item/ItemSpellBook.java b/src/main/java/electroblob/wizardry/item/ItemSpellBook.java index 5be6a328..8e7cc4c3 100644 --- a/src/main/java/electroblob/wizardry/item/ItemSpellBook.java +++ b/src/main/java/electroblob/wizardry/item/ItemSpellBook.java @@ -25,8 +25,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import javax.annotation.Nullable; - public class ItemSpellBook extends Item { public ItemSpellBook(){ diff --git a/src/main/java/electroblob/wizardry/item/ItemWand.java b/src/main/java/electroblob/wizardry/item/ItemWand.java index 86a65241..0d146a49 100644 --- a/src/main/java/electroblob/wizardry/item/ItemWand.java +++ b/src/main/java/electroblob/wizardry/item/ItemWand.java @@ -1,10 +1,10 @@ package electroblob.wizardry.item; +import java.util.List; + import electroblob.wizardry.SpellGlyphData; import electroblob.wizardry.WizardData; import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Constants; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.Tier; @@ -24,7 +24,6 @@ import electroblob.wizardry.util.WizardryUtilities; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -45,9 +44,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; - /** * This class is (literally) where the magic happens! All wand types are single instances of this class. There's a lot * of quite hard-to-read code in here, but unfortunately there's not much I can do about that. For this reason, I have diff --git a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java index e03c2ec4..b5cad876 100644 --- a/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java +++ b/src/main/java/electroblob/wizardry/item/ItemWizardArmour.java @@ -1,16 +1,15 @@ package electroblob.wizardry.item; +import java.util.List; + import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Constants; import electroblob.wizardry.constants.Element; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.resources.I18n; import electroblob.wizardry.registry.WizardryAdvancementTriggers; import electroblob.wizardry.registry.WizardryTabs; import electroblob.wizardry.spell.Petrify; import electroblob.wizardry.util.WizardryUtilities; +import net.minecraft.client.model.ModelBiped; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -29,9 +28,6 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; -import java.util.List; - @Mod.EventBusSubscriber public class ItemWizardArmour extends ItemArmor implements ISpecialArmor { diff --git a/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java b/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java index 22262bff..67a210c5 100644 --- a/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java +++ b/src/main/java/electroblob/wizardry/item/ItemWizardHandbook.java @@ -2,10 +2,11 @@ package electroblob.wizardry.item; import java.util.List; +import javax.annotation.Nullable; + import electroblob.wizardry.Wizardry; import electroblob.wizardry.WizardryGuiHandler; import electroblob.wizardry.registry.WizardryTabs; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,8 +16,6 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import javax.annotation.Nullable; - public class ItemWizardHandbook extends Item { // Yep, I hardcoded my own name into the mod. Don't want people changing it now, do I? diff --git a/src/main/java/electroblob/wizardry/registry/WizardryAchievements.java b/src/main/java/electroblob/wizardry/registry/WizardryAchievements.java deleted file mode 100644 index b271d54f..00000000 --- a/src/main/java/electroblob/wizardry/registry/WizardryAchievements.java +++ /dev/null @@ -1,44 +0,0 @@ -package electroblob.wizardry.registry; - -/** - * Class responsible for defining, storing and registering all of wizardry's achievements (achievements don't have a - * registry, but it make sense to do them the same way as everything else). - * - * @author Electroblob - * @since Wizardry 2.1 - */ -/*public final class WizardryAchievements { - - public static final Achievement crystal = new Achievement("crystal", "crystal", -1, -1, WizardryItems.magic_crystal, null).registerStat(); - public static final Achievement arcane_initiate = new Achievement("arcane_initiate", "arcane_initiate", 2, -1, WizardryItems.magic_wand, crystal).registerStat(); - public static final Achievement apprentice = new Achievement("apprentice", "apprentice", 2, 3, WizardryItems.apprentice_wand, arcane_initiate).registerStat(); - public static final Achievement master = new Achievement("master", "master", 3, 6, WizardryItems.master_wand, apprentice).registerStat(); - public static final Achievement all_spells = new Achievement("all_spells", "all_spells", 5, 7, WizardryItems.wizard_handbook, master).registerStat().setSpecial(); - public static final Achievement wizard_trade = new Achievement("wizard_trade", "wizard_trade", 2, -5, Items.EMERALD, arcane_initiate).registerStat(); - public static final Achievement buy_master_spell = new Achievement("buy_master_spell", "buy_master_spell", 5, -5, WizardryItems.spell_book, wizard_trade).registerStat().setSpecial(); - public static final Achievement freeze_blaze = new Achievement("freeze_blaze", "freeze_blaze", -1, 3, Blocks.ICE, apprentice).registerStat(); - public static final Achievement charge_creeper = new Achievement("charge_creeper", "charge_creeper", -1, 1, Items.GUNPOWDER, arcane_initiate).registerStat(); - public static final Achievement frankenstein = new Achievement("frankenstein", "frankenstein", -3, 1, WizardryItems.advanced_lightning_wand, charge_creeper).registerStat().setSpecial(); - public static final Achievement special_upgrade = new Achievement("special_upgrade", "special_upgrade", 4, 1, WizardryItems.condenser_upgrade, arcane_initiate).registerStat(); - public static final Achievement craft_flask = new Achievement("craft_flask", "craft_flask", 4, -2, WizardryItems.mana_flask, arcane_initiate).registerStat(); - public static final Achievement elemental = new Achievement("elemental", "elemental", 6, -1, WizardryItems.basic_fire_wand, arcane_initiate).registerStat(); - public static final Achievement armour_set = new Achievement("armour_set", "armour_set", 0, -4, WizardryItems.wizard_hat, arcane_initiate).registerStat(); - public static final Achievement legendary = new Achievement("legendary", "legendary", -2, -5, WizardryItems.armour_upgrade, armour_set).registerStat().setSpecial(); - public static final Achievement self_destruct = new Achievement("self_destruct", "self_destruct", 1, 0, Blocks.PUMPKIN, arcane_initiate).registerStat(); - public static final Achievement pig_tornado = new Achievement("pig_tornado", "pig_tornado", 6, 3, Items.SADDLE, apprentice).registerStat().setSpecial(); - public static final Achievement jam_wizard = new Achievement("jam_wizard", "jam_wizard", 4, 4, Blocks.WEB, apprentice).registerStat(); - public static final Achievement slime_skeleton = new Achievement("slime_skeleton", "slime_skeleton", 1, 5, Items.SLIME_BALL, apprentice).registerStat(); - public static final Achievement anger_wizard = new Achievement("anger_wizard", "anger_wizard", 1, -7, Items.IRON_SWORD, wizard_trade).registerStat(); - public static final Achievement defeat_evil_wizard = new Achievement("defeat_evil_wizard", "defeat_evil_wizard", 4, -7, WizardryItems.wizard_boots_necromancy, wizard_trade).registerStat(); - public static final Achievement max_out_wand = new Achievement("max_out_wand", "max_out_wand", 7, 1, WizardryItems.arcane_tome, special_upgrade).registerStat().setSpecial(); - public static final Achievement element_master = new Achievement("element_master", "element_master", 7, -3, WizardryItems.master_ice_wand, elemental).registerStat().setSpecial(); - public static final Achievement identify_spell = new Achievement("identify_spell", "identify_spell", -2, -3, WizardryItems.identification_scroll, arcane_initiate).registerStat(); - - private static final Achievement[] ACHIEVEMENTS_LIST = {crystal, arcane_initiate, apprentice, master, all_spells, - wizard_trade, buy_master_spell, freeze_blaze, charge_creeper, frankenstein, special_upgrade, craft_flask, - elemental, armour_set, legendary, self_destruct, pig_tornado, jam_wizard, slime_skeleton, anger_wizard, - defeat_evil_wizard, max_out_wand, element_master, identify_spell}; - - public static final AchievementPage WIZARDRY_ACHIEVEMENT_PAGE = new AchievementPage("Wizardry", ACHIEVEMENTS_LIST); - -}*/ \ No newline at end of file diff --git a/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java b/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java index b95f7044..5d50f2ba 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java @@ -1,6 +1,7 @@ package electroblob.wizardry.registry; import electroblob.wizardry.util.CustomAdvancementTrigger; +import net.minecraft.advancements.CriteriaTriggers; /** * This class stores a collection of custom advancement triggers, for advancements that cannot be triggered @@ -10,6 +11,7 @@ import electroblob.wizardry.util.CustomAdvancementTrigger; * @since Wizardry 4.1.0 */ public final class WizardryAdvancementTriggers { + public static final CustomAdvancementTrigger armour_set = new CustomAdvancementTrigger("trigger_armour_set"); public static final CustomAdvancementTrigger jam_wizard = new CustomAdvancementTrigger("trigger_jam_wizard"); public static final CustomAdvancementTrigger self_destruct = new CustomAdvancementTrigger("trigger_self_destruct"); @@ -30,4 +32,28 @@ public final class WizardryAdvancementTriggers { public static final CustomAdvancementTrigger freeze_blaze = new CustomAdvancementTrigger("trigger_freeze_blaze"); public static final CustomAdvancementTrigger frankenstein = new CustomAdvancementTrigger("trigger_frankenstein"); public static final CustomAdvancementTrigger charge_creeper = new CustomAdvancementTrigger("trigger_charge_creeper"); + + public static void register(){ + + CriteriaTriggers.register(armour_set); + CriteriaTriggers.register(jam_wizard); + CriteriaTriggers.register(self_destruct); + CriteriaTriggers.register(all_spells); + CriteriaTriggers.register(element_master); + CriteriaTriggers.register(identify_spell); + CriteriaTriggers.register(elemental); + CriteriaTriggers.register(legendary); + CriteriaTriggers.register(max_out_wand); + CriteriaTriggers.register(special_upgrade); + CriteriaTriggers.register(pig_tornado); + CriteriaTriggers.register(master); + CriteriaTriggers.register(apprentice); + CriteriaTriggers.register(anger_wizard); + CriteriaTriggers.register(buy_master_spell); + CriteriaTriggers.register(wizard_trade); + CriteriaTriggers.register(slime_skeleton); + CriteriaTriggers.register(freeze_blaze); + CriteriaTriggers.register(frankenstein); + CriteriaTriggers.register(charge_creeper); + } } \ No newline at end of file diff --git a/src/main/java/electroblob/wizardry/registry/WizardryItems.java b/src/main/java/electroblob/wizardry/registry/WizardryItems.java index 9b636158..ccae6f2f 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryItems.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryItems.java @@ -9,8 +9,6 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableMap; import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.Tier; import electroblob.wizardry.item.ItemArcaneTome; @@ -31,15 +29,12 @@ import electroblob.wizardry.item.ItemWand; import electroblob.wizardry.item.ItemWizardArmour; import electroblob.wizardry.item.ItemWizardHandbook; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; @@ -195,7 +190,7 @@ public final class WizardryItems { public static final Map, Item> WAND_MAP = new HashMap<>(); public static final Map, Item> ARMOUR_MAP = new HashMap<>(); - static{ + static { WAND_MAP.put(ImmutablePair.of(Tier.BASIC, Element.MAGIC), magic_wand); WAND_MAP.put(ImmutablePair.of(Tier.BASIC, Element.FIRE), basic_fire_wand); diff --git a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java index 2ba2799d..eaf9e2dc 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java @@ -1,20 +1,75 @@ package electroblob.wizardry.registry; +import java.util.List; + import com.google.common.collect.Lists; + import electroblob.wizardry.Wizardry; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.Tier; import electroblob.wizardry.entity.EntityArc; import electroblob.wizardry.entity.EntityMeteor; import electroblob.wizardry.entity.EntityShield; -import electroblob.wizardry.entity.construct.*; -import electroblob.wizardry.entity.living.*; -import electroblob.wizardry.entity.projectile.*; +import electroblob.wizardry.entity.construct.EntityArrowRain; +import electroblob.wizardry.entity.construct.EntityBlackHole; +import electroblob.wizardry.entity.construct.EntityBlizzard; +import electroblob.wizardry.entity.construct.EntityBubble; +import electroblob.wizardry.entity.construct.EntityDecay; +import electroblob.wizardry.entity.construct.EntityEarthquake; +import electroblob.wizardry.entity.construct.EntityFireRing; +import electroblob.wizardry.entity.construct.EntityFireSigil; +import electroblob.wizardry.entity.construct.EntityForcefield; +import electroblob.wizardry.entity.construct.EntityFrostSigil; +import electroblob.wizardry.entity.construct.EntityHailstorm; +import electroblob.wizardry.entity.construct.EntityHammer; +import electroblob.wizardry.entity.construct.EntityHealAura; +import electroblob.wizardry.entity.construct.EntityIceSpike; +import electroblob.wizardry.entity.construct.EntityLightningPulse; +import electroblob.wizardry.entity.construct.EntityLightningSigil; +import electroblob.wizardry.entity.construct.EntityTornado; +import electroblob.wizardry.entity.living.EntityBlazeMinion; +import electroblob.wizardry.entity.living.EntityDecoy; +import electroblob.wizardry.entity.living.EntityEvilWizard; +import electroblob.wizardry.entity.living.EntityIceGiant; +import electroblob.wizardry.entity.living.EntityIceWraith; +import electroblob.wizardry.entity.living.EntityLightningWraith; +import electroblob.wizardry.entity.living.EntityMagicSlime; +import electroblob.wizardry.entity.living.EntityPhoenix; +import electroblob.wizardry.entity.living.EntityShadowWraith; +import electroblob.wizardry.entity.living.EntitySilverfishMinion; +import electroblob.wizardry.entity.living.EntitySkeletonMinion; +import electroblob.wizardry.entity.living.EntitySpiderMinion; +import electroblob.wizardry.entity.living.EntitySpiritHorse; +import electroblob.wizardry.entity.living.EntitySpiritWolf; +import electroblob.wizardry.entity.living.EntityStormElemental; +import electroblob.wizardry.entity.living.EntityWitherSkeletonMinion; +import electroblob.wizardry.entity.living.EntityWizard; +import electroblob.wizardry.entity.living.EntityZombieMinion; +import electroblob.wizardry.entity.projectile.EntityDarknessOrb; +import electroblob.wizardry.entity.projectile.EntityDart; +import electroblob.wizardry.entity.projectile.EntityFirebolt; +import electroblob.wizardry.entity.projectile.EntityFirebomb; +import electroblob.wizardry.entity.projectile.EntityForceArrow; +import electroblob.wizardry.entity.projectile.EntityForceOrb; +import electroblob.wizardry.entity.projectile.EntityIceCharge; +import electroblob.wizardry.entity.projectile.EntityIceLance; +import electroblob.wizardry.entity.projectile.EntityIceShard; +import electroblob.wizardry.entity.projectile.EntityLightningArrow; +import electroblob.wizardry.entity.projectile.EntityLightningDisc; +import electroblob.wizardry.entity.projectile.EntityMagicMissile; +import electroblob.wizardry.entity.projectile.EntityPoisonBomb; +import electroblob.wizardry.entity.projectile.EntitySmokeBomb; +import electroblob.wizardry.entity.projectile.EntitySpark; +import electroblob.wizardry.entity.projectile.EntitySparkBomb; +import electroblob.wizardry.entity.projectile.EntityThunderbolt; import electroblob.wizardry.loot.RandomSpell; import electroblob.wizardry.loot.WizardSpell; -import electroblob.wizardry.tileentity.*; +import electroblob.wizardry.tileentity.TileEntityArcaneWorkbench; +import electroblob.wizardry.tileentity.TileEntityMagicLight; +import electroblob.wizardry.tileentity.TileEntityPlayerSave; +import electroblob.wizardry.tileentity.TileEntityStatue; +import electroblob.wizardry.tileentity.TileEntityTimer; import electroblob.wizardry.util.WizardryUtilities; -import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Biomes; @@ -38,8 +93,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.registries.IForgeRegistry; -import java.util.List; - /** * Class responsible for registering all the things that don't have (or need) instances: entities, loot tables, recipes, * etc. @@ -52,29 +105,6 @@ public final class WizardryRegistry { // NOTE: In 1.12, recipes have a registry (they can still stay here though since we don't keep references to them) - public static void registerAdvancementTriggers(){ - CriteriaTriggers.register(WizardryAdvancementTriggers.armour_set); - CriteriaTriggers.register(WizardryAdvancementTriggers.jam_wizard); - CriteriaTriggers.register(WizardryAdvancementTriggers.self_destruct); - CriteriaTriggers.register(WizardryAdvancementTriggers.all_spells); - CriteriaTriggers.register(WizardryAdvancementTriggers.element_master); - CriteriaTriggers.register(WizardryAdvancementTriggers.identify_spell); - CriteriaTriggers.register(WizardryAdvancementTriggers.elemental); - CriteriaTriggers.register(WizardryAdvancementTriggers.legendary); - CriteriaTriggers.register(WizardryAdvancementTriggers.max_out_wand); - CriteriaTriggers.register(WizardryAdvancementTriggers.special_upgrade); - CriteriaTriggers.register(WizardryAdvancementTriggers.pig_tornado); - CriteriaTriggers.register(WizardryAdvancementTriggers.master); - CriteriaTriggers.register(WizardryAdvancementTriggers.apprentice); - CriteriaTriggers.register(WizardryAdvancementTriggers.anger_wizard); - CriteriaTriggers.register(WizardryAdvancementTriggers.buy_master_spell); - CriteriaTriggers.register(WizardryAdvancementTriggers.wizard_trade); - CriteriaTriggers.register(WizardryAdvancementTriggers.slime_skeleton); - CriteriaTriggers.register(WizardryAdvancementTriggers.freeze_blaze); - CriteriaTriggers.register(WizardryAdvancementTriggers.frankenstein); - CriteriaTriggers.register(WizardryAdvancementTriggers.charge_creeper); - } - /** Called from the preInit method in the main mod class to register the custom dungeon loot. */ public static void registerLoot(){ diff --git a/src/main/java/electroblob/wizardry/registry/WizardryTabs.java b/src/main/java/electroblob/wizardry/registry/WizardryTabs.java index d44bfc04..ceb348a1 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryTabs.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryTabs.java @@ -5,7 +5,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import com.google.common.base.Function; import com.google.common.collect.Ordering; import electroblob.wizardry.item.ItemScroll; diff --git a/src/main/java/electroblob/wizardry/spell/ArcaneJammer.java b/src/main/java/electroblob/wizardry/spell/ArcaneJammer.java index 5cef156e..102fa9c5 100644 --- a/src/main/java/electroblob/wizardry/spell/ArcaneJammer.java +++ b/src/main/java/electroblob/wizardry/spell/ArcaneJammer.java @@ -1,8 +1,6 @@ package electroblob.wizardry.spell; import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.SpellType; import electroblob.wizardry.constants.Tier; diff --git a/src/main/java/electroblob/wizardry/spell/IceAge.java b/src/main/java/electroblob/wizardry/spell/IceAge.java index bf66eff1..6c72c2b9 100644 --- a/src/main/java/electroblob/wizardry/spell/IceAge.java +++ b/src/main/java/electroblob/wizardry/spell/IceAge.java @@ -1,5 +1,7 @@ package electroblob.wizardry.spell; +import java.util.List; + import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.SpellType; import electroblob.wizardry.constants.Tier; @@ -21,8 +23,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; - public class IceAge extends Spell { private static final int baseDuration = 1200; diff --git a/src/main/java/electroblob/wizardry/spell/IceStatue.java b/src/main/java/electroblob/wizardry/spell/IceStatue.java index 04b9136a..59938921 100644 --- a/src/main/java/electroblob/wizardry/spell/IceStatue.java +++ b/src/main/java/electroblob/wizardry/spell/IceStatue.java @@ -1,8 +1,6 @@ package electroblob.wizardry.spell; import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.SpellType; import electroblob.wizardry.constants.Tier; diff --git a/src/main/java/electroblob/wizardry/spell/LightningBolt.java b/src/main/java/electroblob/wizardry/spell/LightningBolt.java index 7005665c..85567859 100644 --- a/src/main/java/electroblob/wizardry/spell/LightningBolt.java +++ b/src/main/java/electroblob/wizardry/spell/LightningBolt.java @@ -1,7 +1,5 @@ package electroblob.wizardry.spell; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.SpellType; import electroblob.wizardry.constants.Tier; diff --git a/src/main/java/electroblob/wizardry/spell/Slime.java b/src/main/java/electroblob/wizardry/spell/Slime.java index 62221138..6ba62b8e 100644 --- a/src/main/java/electroblob/wizardry/spell/Slime.java +++ b/src/main/java/electroblob/wizardry/spell/Slime.java @@ -1,8 +1,6 @@ package electroblob.wizardry.spell; import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.SpellType; import electroblob.wizardry.constants.Tier; diff --git a/src/main/java/electroblob/wizardry/spell/Spell.java b/src/main/java/electroblob/wizardry/spell/Spell.java index 94fdb086..8ca229f4 100644 --- a/src/main/java/electroblob/wizardry/spell/Spell.java +++ b/src/main/java/electroblob/wizardry/spell/Spell.java @@ -1,5 +1,11 @@ package electroblob.wizardry.spell; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import electroblob.wizardry.Wizardry; import electroblob.wizardry.constants.Element; import electroblob.wizardry.constants.SpellType; @@ -24,12 +30,6 @@ import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - /** * Generic spell class which is the superclass to all spells in wizardry. When extending this class, you must do the * following: diff --git a/src/main/java/electroblob/wizardry/tileentity/ContainerArcaneWorkbench.java b/src/main/java/electroblob/wizardry/tileentity/ContainerArcaneWorkbench.java index b1ca3fbd..7d65515f 100644 --- a/src/main/java/electroblob/wizardry/tileentity/ContainerArcaneWorkbench.java +++ b/src/main/java/electroblob/wizardry/tileentity/ContainerArcaneWorkbench.java @@ -1,13 +1,18 @@ package electroblob.wizardry.tileentity; +import java.util.HashSet; +import java.util.Set; + import electroblob.wizardry.WizardData; import electroblob.wizardry.Wizardry; -import electroblob.wizardry.advancement.AdvancementHelper; -import electroblob.wizardry.advancement.AdvancementHelper.EnumAdvancement; import electroblob.wizardry.constants.Constants; import electroblob.wizardry.constants.Tier; import electroblob.wizardry.event.SpellBindEvent; -import electroblob.wizardry.item.*; +import electroblob.wizardry.item.ItemArcaneTome; +import electroblob.wizardry.item.ItemArmourUpgrade; +import electroblob.wizardry.item.ItemSpellBook; +import electroblob.wizardry.item.ItemWand; +import electroblob.wizardry.item.ItemWizardArmour; import electroblob.wizardry.registry.Spells; import electroblob.wizardry.registry.WizardryAdvancementTriggers; import electroblob.wizardry.registry.WizardryItems; @@ -24,9 +29,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; -import java.util.HashSet; -import java.util.Set; - public class ContainerArcaneWorkbench extends Container { /** The arcane workbench tile entity associated with this container. */