diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index e33f921..9bcebd6 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -33,11 +33,49 @@ import makeo.gadomancy.client.renderers.block.RenderBlockStoneMachine; import makeo.gadomancy.client.renderers.block.RenderBlockTransparent; import makeo.gadomancy.client.renderers.entity.RenderAdditionalGolemBase; import makeo.gadomancy.client.renderers.entity.RenderEntityAuraCore; -import makeo.gadomancy.client.renderers.item.*; -import makeo.gadomancy.client.renderers.tile.*; +import makeo.gadomancy.client.renderers.item.ItemCreativeNodeRenderer; +import makeo.gadomancy.client.renderers.item.ItemExNodeRenderer; +import makeo.gadomancy.client.renderers.item.ItemJarExtendedNodeRenderer; +import makeo.gadomancy.client.renderers.item.ItemRenderFamiliar; +import makeo.gadomancy.client.renderers.item.ItemRenderRemoteJar; +import makeo.gadomancy.client.renderers.item.ItemRenderStoneMachine; +import makeo.gadomancy.client.renderers.item.ItemRenderTEKnowledgeBook; +import makeo.gadomancy.client.renderers.item.ItemRenderTileEntity; +import makeo.gadomancy.client.renderers.item.ItemRenderTileEntityMulti; +import makeo.gadomancy.client.renderers.tile.RenderTileArcaneDropper; +import makeo.gadomancy.client.renderers.tile.RenderTileArcanePackager; +import makeo.gadomancy.client.renderers.tile.RenderTileAuraPylon; +import makeo.gadomancy.client.renderers.tile.RenderTileBlockProtector; +import makeo.gadomancy.client.renderers.tile.RenderTileCapEldritch; +import makeo.gadomancy.client.renderers.tile.RenderTileEssentiaCompressor; +import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNode; +import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNodeJar; +import makeo.gadomancy.client.renderers.tile.RenderTileInfusionClaw; +import makeo.gadomancy.client.renderers.tile.RenderTileKnowledgeBook; +import makeo.gadomancy.client.renderers.tile.RenderTileManipulationFocus; +import makeo.gadomancy.client.renderers.tile.RenderTileManipulatorPillar; +import makeo.gadomancy.client.renderers.tile.RenderTileNodeManipulator; +import makeo.gadomancy.client.renderers.tile.RenderTileObelisk; +import makeo.gadomancy.client.renderers.tile.RenderTileRemoteJar; +import makeo.gadomancy.client.renderers.tile.RenderTileStickyJar; import makeo.gadomancy.client.util.MultiTickEffectDispatcher; import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.blocks.tiles.*; +import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; +import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; +import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; +import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; +import makeo.gadomancy.common.blocks.tiles.TileAuraPylonTop; +import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; +import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; +import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; +import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar; +import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.entities.EntityAuraCore; import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.registration.RegisteredBlocks; diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java b/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java index edfa69f..8c50ed4 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.effect.fx; -import java.awt.*; +import java.awt.Color; import java.util.Random; import net.minecraft.client.Minecraft; diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java b/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java index 4689d11..9c0b6d8 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.effect.fx; -import java.awt.*; +import java.awt.Color; import java.util.ArrayDeque; import java.util.Queue; import java.util.Random; diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java b/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java index 8bb3930..9965576 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.effect.fx; -import java.awt.*; +import java.awt.Color; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java index b219de0..2c91fd2 100644 --- a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java @@ -15,7 +15,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.*; +import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.client.event.GuiOpenEvent; +import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.client.event.RenderLivingEvent; +import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.client.model.obj.WavefrontObject; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java index c1f3173..3c45d11 100644 --- a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java +++ b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.gui; -import java.awt.*; +import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java b/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java index b83ba36..538008e 100644 --- a/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java +++ b/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.gui; -import java.awt.*; +import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java b/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java index ea316e9..890d8bb 100644 --- a/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java +++ b/src/main/java/makeo/gadomancy/client/models/ModelWandPart.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.models; -import java.awt.*; +import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java index 6030a63..d14b938 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.renderers.entity; -import java.awt.*; +import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java index df9c74c..2bbd014 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.renderers.item; -import java.awt.*; +import java.awt.Color; import java.util.Random; import net.minecraft.client.Minecraft; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java index dd9df3d..f7f9f2b 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.renderers.tile; -import java.awt.*; +import java.awt.Color; import java.util.Random; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java b/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java index 8202852..93ca6d9 100644 --- a/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java +++ b/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java @@ -1,6 +1,7 @@ package makeo.gadomancy.client.textures; -import java.awt.*; +import java.awt.Graphics2D; +import java.awt.Image; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java index 65eb5c6..fd592e5 100644 --- a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java +++ b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java @@ -1,6 +1,6 @@ package makeo.gadomancy.client.util; -import java.awt.*; +import java.awt.Color; import java.util.Random; import net.minecraft.client.Minecraft; diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 61b550b..865988d 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -27,7 +27,16 @@ import makeo.gadomancy.common.events.EventHandlerNetwork; import makeo.gadomancy.common.events.EventHandlerWorld; import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.registration.*; +import makeo.gadomancy.common.registration.ModSubstitutions; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredEnchantments; +import makeo.gadomancy.common.registration.RegisteredEntities; +import makeo.gadomancy.common.registration.RegisteredGolemStuff; +import makeo.gadomancy.common.registration.RegisteredIntegrations; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.registration.RegisteredPotions; +import makeo.gadomancy.common.registration.RegisteredRecipes; +import makeo.gadomancy.common.registration.RegisteredResearches; import makeo.gadomancy.common.utils.Injector; import makeo.gadomancy.common.utils.world.WorldProviderTCEldrich; import thaumcraft.api.wands.WandTriggerRegistry; diff --git a/src/main/java/makeo/gadomancy/common/Gadomancy.java b/src/main/java/makeo/gadomancy/common/Gadomancy.java index 8d80445..0b739a1 100644 --- a/src/main/java/makeo/gadomancy/common/Gadomancy.java +++ b/src/main/java/makeo/gadomancy/common/Gadomancy.java @@ -7,7 +7,11 @@ import org.apache.logging.log4j.MarkerManager; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLConstructionEvent; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.common.api.DefaultApiHandler; import makeo.gadomancy.common.data.config.ModConfig; diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java index ddd47bf..40f7441 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java @@ -1,6 +1,10 @@ package makeo.gadomancy.common.aura; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java index 61f0844..eb19cb6 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java @@ -6,7 +6,11 @@ import static makeo.gadomancy.common.utils.MiscUtils.ticksForSeconds; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityAgeable; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.monster.EntitySkeleton; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java index c4491ae..95627c0 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java @@ -1,6 +1,11 @@ package makeo.gadomancy.common.blocks.tiles; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.UUID; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java index 7f02701..d7a0703 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java @@ -1,8 +1,11 @@ package makeo.gadomancy.common.blocks.tiles; -import java.awt.*; -import java.util.*; +import java.awt.Color; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; +import java.util.Map; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java index a2dba8d..1850ccd 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java @@ -1,6 +1,10 @@ package makeo.gadomancy.common.blocks.tiles; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java index 811a27a..37aac56 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java @@ -1,6 +1,10 @@ package makeo.gadomancy.common.blocks.tiles; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java index c598efb..4dd3272 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java @@ -1,6 +1,12 @@ package makeo.gadomancy.common.blocks.tiles; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModData.java b/src/main/java/makeo/gadomancy/common/data/config/ModData.java index 98337e6..2380fb9 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModData.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModData.java @@ -1,6 +1,11 @@ package makeo.gadomancy.common.data.config; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java index 5d51221..8d2d3c5 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java @@ -1,6 +1,6 @@ package makeo.gadomancy.common.entities; -import java.awt.*; +import java.awt.Color; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java b/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java index f2e0fbf..9693d0b 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java +++ b/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java @@ -5,8 +5,32 @@ import java.net.SocketAddress; import javax.crypto.SecretKey; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.*; -import net.minecraft.network.play.client.*; +import net.minecraft.network.EnumConnectionState; +import net.minecraft.network.INetHandler; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.client.C00PacketKeepAlive; +import net.minecraft.network.play.client.C01PacketChatMessage; +import net.minecraft.network.play.client.C02PacketUseEntity; +import net.minecraft.network.play.client.C03PacketPlayer; +import net.minecraft.network.play.client.C07PacketPlayerDigging; +import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement; +import net.minecraft.network.play.client.C09PacketHeldItemChange; +import net.minecraft.network.play.client.C0APacketAnimation; +import net.minecraft.network.play.client.C0BPacketEntityAction; +import net.minecraft.network.play.client.C0CPacketInput; +import net.minecraft.network.play.client.C0DPacketCloseWindow; +import net.minecraft.network.play.client.C0EPacketClickWindow; +import net.minecraft.network.play.client.C0FPacketConfirmTransaction; +import net.minecraft.network.play.client.C10PacketCreativeInventoryAction; +import net.minecraft.network.play.client.C11PacketEnchantItem; +import net.minecraft.network.play.client.C12PacketUpdateSign; +import net.minecraft.network.play.client.C13PacketPlayerAbilities; +import net.minecraft.network.play.client.C14PacketTabComplete; +import net.minecraft.network.play.client.C15PacketClientSettings; +import net.minecraft.network.play.client.C16PacketClientStatus; +import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.server.MinecraftServer; import net.minecraft.util.IChatComponent; diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java index 3cddeda..259bfb5 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java @@ -6,7 +6,13 @@ import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILookIdle; +import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget; +import net.minecraft.entity.ai.EntityAIOwnerHurtTarget; +import net.minecraft.entity.ai.EntityAIWatchClosest; +import net.minecraft.entity.ai.EntityLookHelper; +import net.minecraft.entity.ai.EntitySenses; import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.EntityTameable; diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java index 3b17412..baa1497 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java @@ -40,7 +40,11 @@ import makeo.gadomancy.common.entities.EntityItemElement; import makeo.gadomancy.common.items.ItemElement; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.*; +import makeo.gadomancy.common.utils.GolemEnumHelper; +import makeo.gadomancy.common.utils.ItemUtils; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.NBTHelper; +import makeo.gadomancy.common.utils.WandHandler; import makeo.gadomancy.common.utils.world.TCMazeHandler; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.items.wands.ItemWandCasting; diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java index ab6296c..45ab5d5 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java @@ -1,6 +1,12 @@ package makeo.gadomancy.common.familiar; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java index 7cedd06..fcd50d3 100644 --- a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java +++ b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java @@ -4,7 +4,16 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.network.packets.*; +import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb; +import makeo.gadomancy.common.network.packets.PacketFamiliarBolt; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.network.packets.PacketSyncConfigs; +import makeo.gadomancy.common.network.packets.PacketSyncData; +import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; +import makeo.gadomancy.common.network.packets.PacketTCNotificationText; +import makeo.gadomancy.common.network.packets.PacketTCWispyLine; +import makeo.gadomancy.common.network.packets.PacketUpdateGolemTypeOrder; +import makeo.gadomancy.common.network.packets.PacketUpdateOnlineState; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java index e29aaf9..fec3952 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java @@ -1,6 +1,11 @@ package makeo.gadomancy.common.network.packets; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java index 24fe784..ed8a391 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java @@ -1,6 +1,6 @@ package makeo.gadomancy.common.network.packets; -import java.awt.*; +import java.awt.Color; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java index 956da4b..396bdae 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java @@ -1,6 +1,9 @@ package makeo.gadomancy.common.network.packets; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; import java.util.Map; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java b/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java index e7134b3..a36dc58 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionCustomTexture.java @@ -1,6 +1,6 @@ package makeo.gadomancy.common.potions; -import java.awt.*; +import java.awt.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java b/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java index ae9e809..1ac09ee 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java @@ -1,6 +1,6 @@ package makeo.gadomancy.common.potions; -import java.awt.*; +import java.awt.Color; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index a2a7b1e..a1f95a7 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -11,10 +11,42 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.common.blocks.*; -import makeo.gadomancy.common.blocks.tiles.*; +import makeo.gadomancy.common.blocks.BlockAdditionalEldritchPortal; +import makeo.gadomancy.common.blocks.BlockArcaneDropper; +import makeo.gadomancy.common.blocks.BlockAuraPylon; +import makeo.gadomancy.common.blocks.BlockEssentiaCompressor; +import makeo.gadomancy.common.blocks.BlockExtendedNodeJar; +import makeo.gadomancy.common.blocks.BlockInfusionClaw; +import makeo.gadomancy.common.blocks.BlockKnowledgeBook; +import makeo.gadomancy.common.blocks.BlockNode; +import makeo.gadomancy.common.blocks.BlockNodeManipulator; +import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.blocks.BlockStickyJar; +import makeo.gadomancy.common.blocks.BlockStoneMachine; +import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; +import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; +import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; +import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; +import makeo.gadomancy.common.blocks.tiles.TileAuraPylonTop; +import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; +import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; +import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; +import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar; +import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.items.*; +import makeo.gadomancy.common.items.ItemBlockAdditionalEldritchPortal; +import makeo.gadomancy.common.items.ItemBlockAuraPylon; +import makeo.gadomancy.common.items.ItemBlockEssentiaCompressor; +import makeo.gadomancy.common.items.ItemBlockKnowledgeBook; +import makeo.gadomancy.common.items.ItemBlockRemoteJar; +import makeo.gadomancy.common.items.ItemBlockStoneMachine; +import makeo.gadomancy.common.items.ItemNodeManipulator; import thaumcraft.common.blocks.BlockAiry; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.tiles.TileInfusionMatrix; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java index 3ee66bb..4e74de5 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java @@ -2,7 +2,12 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.Loader; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.integration.*; +import makeo.gadomancy.common.integration.IntegrationAutomagy; +import makeo.gadomancy.common.integration.IntegrationMod; +import makeo.gadomancy.common.integration.IntegrationMorph; +import makeo.gadomancy.common.integration.IntegrationNEI; +import makeo.gadomancy.common.integration.IntegrationThaumicExploration; +import makeo.gadomancy.common.integration.IntegrationThaumicTinkerer; import makeo.gadomancy.common.integration.mystcraft.IntegrationMystcraft; import makeo.gadomancy.common.utils.Injector; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index 83ca88f..8b0ebf4 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -15,7 +15,17 @@ import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.items.*; +import makeo.gadomancy.common.items.ItemArcanePackage; +import makeo.gadomancy.common.items.ItemAuraCore; +import makeo.gadomancy.common.items.ItemCreativeNode; +import makeo.gadomancy.common.items.ItemElement; +import makeo.gadomancy.common.items.ItemExtendedNodeJar; +import makeo.gadomancy.common.items.ItemFakeGolemPlacer; +import makeo.gadomancy.common.items.ItemFakeGolemShield; +import makeo.gadomancy.common.items.ItemFakeLootbag; +import makeo.gadomancy.common.items.ItemFakeModIcon; +import makeo.gadomancy.common.items.ItemGolemCoreBreak; +import makeo.gadomancy.common.items.ItemTransformationFocus; import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; import makeo.gadomancy.common.research.SimpleResearchItem; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java index cb72d4a..2215c9b 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java @@ -7,7 +7,11 @@ import net.minecraft.potion.Potion; import cpw.mods.fml.common.FMLLog; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.potions.*; +import makeo.gadomancy.common.potions.PotionAchromatic; +import makeo.gadomancy.common.potions.PotionBuffGolem; +import makeo.gadomancy.common.potions.PotionEldritch; +import makeo.gadomancy.common.potions.PotionMiningLuck; +import makeo.gadomancy.common.potions.PotionVisAffinity; import makeo.gadomancy.common.utils.Injector; /** diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index 9460a7f..92dce2d 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -13,7 +13,11 @@ import net.minecraft.item.crafting.IRecipe; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.crafting.*; +import makeo.gadomancy.common.crafting.EtherealFamiliarUpgradeRecipe; +import makeo.gadomancy.common.crafting.FamiliarUndoRecipe; +import makeo.gadomancy.common.crafting.InfusionDisguiseArmor; +import makeo.gadomancy.common.crafting.InfusionUpgradeRecipe; +import makeo.gadomancy.common.crafting.RecipeStickyJar; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.familiar.FamiliarAugment; import makeo.gadomancy.common.items.ItemAuraCore; @@ -265,7 +269,7 @@ public class RegisteredRecipes { 'S', new ItemStack(ConfigBlocks.blockCrystal, 1, 6), 'G', - new ItemStack(Items.gunpowder)); + new ItemStack(ConfigItems.itemResource, 1, 14)); // Glyphed Stone RegisteredRecipes.eldritchdecoblocks3 = ThaumcraftApi.addArcaneCraftingRecipe( diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index dbcef07..22e6f9a 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -11,7 +11,13 @@ import makeo.gadomancy.common.crafting.RecipeVisualStickyJar; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.items.ItemAuraCore; import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; -import makeo.gadomancy.common.research.*; +import makeo.gadomancy.common.research.AlternatingResearchItem; +import makeo.gadomancy.common.research.DisguiseResearchItem; +import makeo.gadomancy.common.research.IfAnyParentResearchItem; +import makeo.gadomancy.common.research.MultiResearchPage; +import makeo.gadomancy.common.research.PseudoResearchItem; +import makeo.gadomancy.common.research.SimpleResearchItem; +import makeo.gadomancy.common.research.StickyJarResearchItem; import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java b/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java index 499bd19..aae0f66 100644 --- a/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/ColorHelper.java @@ -1,6 +1,6 @@ package makeo.gadomancy.common.utils; -import java.awt.*; +import java.awt.Color; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java index 55a7ea3..e19929a 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java @@ -1,13 +1,22 @@ package makeo.gadomancy.common.utils.world; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.concurrent.ConcurrentHashMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.*; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraft.util.Vec3; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; diff --git a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java index 3f11d40..385987e 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorld.java @@ -7,7 +7,11 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.profiler.Profiler; -import net.minecraft.world.*; +import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.MinecraftException; +import net.minecraft.world.World; +import net.minecraft.world.WorldProvider; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.chunk.storage.IChunkLoader; import net.minecraft.world.storage.IPlayerFileData; diff --git a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java index b1a7a72..739305b 100644 --- a/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java +++ b/src/main/java/makeo/gadomancy/coremod/GadomancyTransformer.java @@ -6,7 +6,13 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.VarInsnNode; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.asm.transformers.AccessTransformer;