From d045822b839b79dc0f27fb55bfdecde46f748f68 Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Tue, 3 Nov 2015 12:29:07 +0100 Subject: [PATCH] - Imports organized.. --- .../makeo/gadomancy/client/ClientProxy.java | 28 ++++++++++++++++--- .../client/events/RenderEventHandler.java | 1 - .../renderers/item/ItemRenderFamiliar.java | 1 - .../tile/RenderTileExtendedNode.java | 2 +- .../renderers/tile/RenderTileRemoteJar.java | 2 +- .../client/util/FamiliarHandlerClient.java | 9 +----- .../makeo/gadomancy/client/util/UtilsFX.java | 1 - .../makeo/gadomancy/common/CommonProxy.java | 11 ++++++-- .../common/api/DefaultApiHandler.java | 2 +- .../common/blocks/BlockExtendedNodeJar.java | 1 - .../common/blocks/BlockInfusionClaw.java | 2 +- .../common/blocks/BlockNodeManipulator.java | 4 --- .../common/blocks/BlockRemoteJar.java | 2 -- .../common/blocks/tiles/TileExtendedNode.java | 5 ---- .../common/blocks/tiles/TileInfusionClaw.java | 2 +- .../common/blocks/tiles/TileRemoteJar.java | 8 +++++- .../makeo/gadomancy/common/data/ModData.java | 7 ++++- .../common/entities/ai/AIBreakBlock.java | 6 +++- .../entities/fake/FakeNetServerHandler.java | 28 +++++++++++++++++-- .../entities/golems/cores/BodyguardCore.java | 9 ++++-- .../golems/nbt/ExtendedGolemProperties.java | 2 +- .../golems/types/SilverwoodGolemType.java | 2 +- .../common/events/EventHandlerGolem.java | 2 +- .../common/events/EventHandlerWorld.java | 18 ------------ .../integration/IntegrationAutomagy.java | 1 - .../IntegrationThaumicHorizions.java | 6 ++-- .../waila/InfusionClawProvider.java | 4 ++- .../integration/waila/IntegrationWaila.java | 1 - .../integration/waila/RemoteJarProvider.java | 1 - .../integration/waila/StickyJarProvider.java | 1 - .../common/items/ItemBlockRemoteJar.java | 4 --- .../common/items/ItemExtendedNodeJar.java | 2 +- .../common/items/ItemFakeModIcon.java | 5 ---- .../packets/PacketAnimationAbsorb.java | 3 -- .../network/packets/PacketTCNodeBolt.java | 3 -- .../packets/PacketUpdateGolemTypeOrder.java | 6 +++- .../node/NodeManipulatorResultHandler.java | 1 - .../common/registration/ModSubstitutions.java | 8 ------ .../common/registration/RegisteredBlocks.java | 20 +++++++++++-- .../registration/RegisteredGolemStuff.java | 2 +- .../common/registration/RegisteredItems.java | 8 ++++-- .../registration/RegisteredMultiblocks.java | 1 - .../common/utils/ExplosionHelper.java | 4 --- .../common/utils/GolemEnumHelper.java | 2 +- .../common/utils/JarMultiblockHandler.java | 2 +- .../common/utils/MultiblockHelper.java | 1 - 46 files changed, 131 insertions(+), 110 deletions(-) diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 82aa11a..002bdb3 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -12,11 +12,31 @@ import makeo.gadomancy.client.gui.InfusionClawGui; import makeo.gadomancy.client.renderers.block.BlockExtendedNodeJarRenderer; import makeo.gadomancy.client.renderers.block.RenderBlockTransparent; import makeo.gadomancy.client.renderers.entity.RenderAdditionalGolemBase; -import makeo.gadomancy.client.renderers.item.*; -import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.client.renderers.tile.*; +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.ItemRenderTileEntity; +import makeo.gadomancy.client.renderers.tile.RenderTileArcaneDropper; +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.RenderTileManipulationFocus; +import makeo.gadomancy.client.renderers.tile.RenderTileManipulatorPillar; +import makeo.gadomancy.client.renderers.tile.RenderTileNodeManipulator; +import makeo.gadomancy.client.renderers.tile.RenderTileRemoteJar; +import makeo.gadomancy.client.renderers.tile.RenderTileStickyJar; import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.blocks.tiles.*; +import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; +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.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.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; diff --git a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java index e974ca8..3e94d9b 100644 --- a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java @@ -23,7 +23,6 @@ import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.client.lib.REHWandHandler; import thaumcraft.common.items.relics.ItemThaumometer; import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.tiles.TileJarNode; import java.util.ArrayList; 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 3ae0823..2b49f7c 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java @@ -5,7 +5,6 @@ import makeo.gadomancy.common.items.baubles.ItemFamiliar; import makeo.gadomancy.common.utils.FakeWorld; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java index 804dc35..0d73ae2 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java @@ -1,7 +1,7 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.node.ExtendedNodeType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java index 541b44f..cec28ff 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java @@ -1,8 +1,8 @@ package makeo.gadomancy.client.renderers.tile; import makeo.gadomancy.client.models.ModelJarPot; -import makeo.gadomancy.common.utils.FakeWorld; import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.utils.FakeWorld; import makeo.gadomancy.common.utils.SimpleResourceLocation; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java index 7598028..d7a92e9 100644 --- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java +++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java @@ -5,24 +5,17 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import makeo.gadomancy.common.items.baubles.ItemFamiliar; import makeo.gadomancy.common.network.packets.PacketFamiliar; -import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.FakeWorld; -import makeo.gadomancy.common.utils.NBTHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.DataWatcher; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import thaumcraft.api.aspects.Aspect; import thaumcraft.client.fx.bolt.FXLightningBolt; -import thaumcraft.client.renderers.entity.RenderPrimalOrb; import thaumcraft.client.renderers.entity.RenderWisp; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.entities.monster.EntityWisp; import java.lang.ref.WeakReference; @@ -175,7 +168,7 @@ public class FamiliarHandlerClient { double theta = RAD_CAP * part; this.renderX = RADIUS * Math.cos(theta); this.renderZ = RADIUS * Math.sin(theta); - this.renderY = 0.7 + Math.sin(theta * 2) / 4D; + this.renderY = 0.7 + Math.sin(theta * 2) / 2D; this.posX = owner.get().posX + renderX; this.posZ = owner.get().posZ + renderZ; diff --git a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java index 0b19bed..5a83140 100644 --- a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java +++ b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java @@ -1,6 +1,5 @@ package makeo.gadomancy.client.util; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.world.World; import thaumcraft.common.Thaumcraft; diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index 080ea15..c8e8687 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; +import makeo.gadomancy.client.ClientProxy; import makeo.gadomancy.common.containers.ContainerInfusionClaw; import makeo.gadomancy.common.events.EventHandlerEntity; import makeo.gadomancy.common.events.EventHandlerGolem; @@ -11,8 +12,14 @@ import makeo.gadomancy.common.events.EventHandlerNetwork; import makeo.gadomancy.common.events.EventHandlerWorld; import makeo.gadomancy.common.familiar.FamiliarHandlerServer; import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.registration.*; -import makeo.gadomancy.client.ClientProxy; +import makeo.gadomancy.common.registration.ModSubstitutions; +import makeo.gadomancy.common.registration.RegisteredBlocks; +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 net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java index b931067..2e0e38d 100644 --- a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java +++ b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java @@ -1,11 +1,11 @@ package makeo.gadomancy.common.api; import cpw.mods.fml.common.registry.GameRegistry; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.ClickBehavior; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import makeo.gadomancy.api.internal.IApiHandler; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.ModConfig; import makeo.gadomancy.common.entities.golems.ItemAdditionalGolemPlacer; import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java index 6ae6b84..7ea56e5 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java @@ -2,7 +2,6 @@ package makeo.gadomancy.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; import makeo.gadomancy.common.items.ItemExtendedNodeJar; import makeo.gadomancy.common.registration.RegisteredBlocks; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java b/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java index a46c133..d77b3b0 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java @@ -1,7 +1,7 @@ package makeo.gadomancy.common.blocks; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.ClickBehavior; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java index 1b5d1ac..de34eb5 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java @@ -2,14 +2,11 @@ package makeo.gadomancy.common.blocks; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; -import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.registration.RegisteredRecipes; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -18,7 +15,6 @@ import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.common.blocks.BlockStoneDevice; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.research.ResearchManager; -import thaumcraft.common.lib.utils.InventoryUtils; import java.util.List; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java index 783526d..8806e5b 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java @@ -7,11 +7,9 @@ import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.NBTHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import thaumcraft.common.blocks.BlockJar; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java index b6b1050..0efcc2c 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -21,18 +20,14 @@ import net.minecraft.world.EnumDifficulty; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; import thaumcraft.api.nodes.INode; -import thaumcraft.common.Thaumcraft; import thaumcraft.common.entities.EntityAspectOrb; import thaumcraft.common.entities.monster.EntityWisp; import thaumcraft.common.items.ItemCrystalEssence; import thaumcraft.common.items.ItemManaBean; import thaumcraft.common.items.ItemWispEssence; -import thaumcraft.common.lib.network.playerdata.PacketResearchComplete; -import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.tiles.TileNode; import java.util.List; -import java.util.Random; /** * This class is part of the Gadomancy Mod diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java index ab9a064..7d93451 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java @@ -4,8 +4,8 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.ClickBehavior; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.fake.AdvancedFakePlayer; import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.network.packets.PacketStartAnimation; 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 c7844bf..f3812e8 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java @@ -5,7 +5,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import thaumcraft.common.tiles.TileJarFillable; -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; /** * This class is part of the Gadomancy Mod diff --git a/src/main/java/makeo/gadomancy/common/data/ModData.java b/src/main/java/makeo/gadomancy/common/data/ModData.java index 475420b..e904694 100644 --- a/src/main/java/makeo/gadomancy/common/data/ModData.java +++ b/src/main/java/makeo/gadomancy/common/data/ModData.java @@ -5,7 +5,12 @@ import cpw.mods.fml.common.FMLLog; import makeo.gadomancy.common.Gadomancy; import net.minecraft.server.MinecraftServer; -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/ai/AIBreakBlock.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java index 401f07e..55bde47 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java @@ -18,7 +18,11 @@ import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.Marker; import thaumcraft.common.lib.utils.InventoryUtils; -import java.util.*; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * This class is part of the Gadomancy Mod 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 51f9706..e3b3032 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java +++ b/src/main/java/makeo/gadomancy/common/entities/fake/FakeNetServerHandler.java @@ -4,8 +4,32 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.util.concurrent.GenericFutureListener; 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/BodyguardCore.java b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardCore.java index b4ad93a..fbb0fd8 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardCore.java @@ -11,14 +11,19 @@ import makeo.gadomancy.common.registration.RegisteredItems; 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; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.pathfinding.PathNavigate; -import thaumcraft.common.entities.ai.combat.AIDartAttack; import thaumcraft.common.entities.ai.misc.AIOpenDoor; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java index 960bf3c..cc28c6b 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java @@ -1,9 +1,9 @@ package makeo.gadomancy.common.entities.golems.nbt; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.ModConfig; import makeo.gadomancy.common.entities.golems.cores.EntityAITasksWrapper; import makeo.gadomancy.common.utils.NBTHelper; diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java index 0f18efc..7b7b314 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java @@ -1,7 +1,7 @@ package makeo.gadomancy.common.entities.golems.types; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.utils.SimpleResourceLocation; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java index 5994b42..0eb5efc 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java @@ -2,12 +2,12 @@ package makeo.gadomancy.common.events; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import makeo.gadomancy.api.golems.events.GolemDropPlacerEvent; import makeo.gadomancy.api.golems.events.PlacerCreateGolemEvent; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.ModConfig; import makeo.gadomancy.common.entities.golems.ItemAdditionalGolemPlacer; import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java index 16d045f..5044610 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java @@ -6,41 +6,23 @@ import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredIntegrations; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.GolemEnumHelper; import makeo.gadomancy.common.utils.JarMultiblockHandler; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.nodes.INode; -import thaumcraft.common.blocks.BlockMagicalLog; -import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.tiles.TileJarFillable; -import thaumcraft.common.tiles.TileJarNode; -import thaumcraft.common.tiles.TileOwned; -import thaumcraft.common.tiles.TileWarded; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java index 44b6e54..0395549 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.integration; import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.registration.ModSubstitutions; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import net.minecraft.block.Block; diff --git a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java index 4cc529b..6d84fca 100644 --- a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java +++ b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java @@ -11,13 +11,13 @@ import cpw.mods.fml.common.registry.ExistingSubstitutionException; import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.ClickBehavior; +import makeo.gadomancy.client.ClientProxy; +import makeo.gadomancy.common.CommonProxy; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.integration.IntegrationMod; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.utils.Injector; -import makeo.gadomancy.client.ClientProxy; -import makeo.gadomancy.common.CommonProxy; import net.minecraft.block.Block; import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.Entity; diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java index 5b66688..d652539 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java @@ -1,7 +1,9 @@ package makeo.gadomancy.common.integration.waila; import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -import mcp.mobius.waila.api.*; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java index 8f75178..7e30bea 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java @@ -3,7 +3,6 @@ package makeo.gadomancy.common.integration.waila; import makeo.gadomancy.common.blocks.BlockInfusionClaw; import makeo.gadomancy.common.blocks.BlockRemoteJar; import makeo.gadomancy.common.blocks.BlockStickyJar; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.integration.IntegrationMod; import mcp.mobius.waila.api.impl.ModuleRegistrar; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java index 8e98916..a7400d2 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.integration.waila; import makeo.gadomancy.common.blocks.BlockRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; import makeo.gadomancy.common.items.ItemBlockRemoteJar; import mcp.mobius.waila.api.IWailaConfigHandler; diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java index 9aa4aeb..69abc4b 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java @@ -7,7 +7,6 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java index cf32cfa..163a3bc 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java @@ -5,9 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; import makeo.gadomancy.client.events.ResourceReloadListener; import makeo.gadomancy.common.blocks.BlockRemoteJar; import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.NBTHelper; import makeo.gadomancy.common.utils.StringHelper; import net.minecraft.block.Block; @@ -16,12 +14,10 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.IWandTriggerManager; import thaumcraft.common.blocks.ItemJarFilled; import thaumcraft.common.config.ConfigItems; diff --git a/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java index c07d658..b59bf8b 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java @@ -1,7 +1,7 @@ package makeo.gadomancy.common.items; -import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.registration.RegisteredBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java index 650d817..42fd744 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java @@ -1,14 +1,9 @@ package makeo.gadomancy.common.items; import makeo.gadomancy.common.Gadomancy; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; - -import java.awt.*; /** * This class is part of the Gadomancy Mod diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java index 0d0b2e3..1f3edd0 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java @@ -9,9 +9,6 @@ import io.netty.buffer.ByteBuf; import makeo.gadomancy.client.util.MultiTickEffectDispatcher; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import thaumcraft.common.Thaumcraft; /** * This class is part of the Gadomancy Mod diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java index 1cdadde..ae4bbe8 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java @@ -7,10 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; -import net.minecraft.util.Vec3; -import net.minecraftforge.common.DimensionManager; import thaumcraft.client.fx.bolt.FXLightningBolt; -import thaumcraft.common.Thaumcraft; /** * This class is part of the Gadomancy Mod 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 779962a..ba6f825 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java @@ -6,7 +6,11 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import makeo.gadomancy.common.utils.GolemEnumHelper; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.util.Map; /** diff --git a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java index a2447f3..5f5d702 100644 --- a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java +++ b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java @@ -5,7 +5,6 @@ import makeo.gadomancy.common.registration.RegisteredManipulations; import net.minecraft.util.WeightedRandom; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.lib.research.ResearchManager; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java b/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java index 4a3ad59..1f098b6 100644 --- a/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java +++ b/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java @@ -3,21 +3,13 @@ package makeo.gadomancy.common.registration; import com.google.common.collect.BiMap; import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.common.CommonProxy; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.api.research.ResearchPage; -import thaumcraft.common.blocks.BlockAiryItem; import thaumcraft.common.config.ConfigBlocks; -import java.util.List; - /** * This class is part of the Gadomancy Mod * Gadomancy is Open Source and distributed under the diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index 574c399..e570320 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -2,8 +2,23 @@ package makeo.gadomancy.common.registration; 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.BlockArcaneDropper; +import makeo.gadomancy.common.blocks.BlockExtendedNodeJar; +import makeo.gadomancy.common.blocks.BlockInfusionClaw; +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.TileArcaneDropper; +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.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.items.ItemBlockRemoteJar; import makeo.gadomancy.common.items.ItemBlockStoneMachine; import makeo.gadomancy.common.items.ItemNodeManipulator; @@ -12,7 +27,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import thaumcraft.common.blocks.BlockStoneDeviceItem; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.tiles.TileInfusionMatrix; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java index 713b77d..3dc33e0 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredGolemStuff.java @@ -1,9 +1,9 @@ package makeo.gadomancy.common.registration; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.golems.cores.BodyguardCore; import makeo.gadomancy.common.entities.golems.cores.BreakGolemCore; import makeo.gadomancy.common.entities.golems.types.SilverwoodGolemType; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index 3d81ffe..dbe7cb1 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -2,7 +2,12 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.items.*; +import makeo.gadomancy.common.items.ItemExtendedNodeJar; +import makeo.gadomancy.common.items.ItemFakeGolemPlacer; +import makeo.gadomancy.common.items.ItemFakeGolemShield; +import makeo.gadomancy.common.items.ItemFakeModIcon; +import makeo.gadomancy.common.items.ItemGolemCoreBreak; +import makeo.gadomancy.common.items.ItemTransformationFocus; import makeo.gadomancy.common.items.baubles.ItemFamiliar; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -11,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java index f6cc162..170a52d 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredMultiblocks.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.registration; import makeo.gadomancy.common.utils.MultiblockHelper; -import net.minecraft.init.Blocks; import thaumcraft.common.config.ConfigBlocks; /** diff --git a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java index 7392611..2447c0b 100644 --- a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java @@ -1,6 +1,5 @@ package makeo.gadomancy.common.utils; -import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.network.NetworkRegistry; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.network.PacketHandler; @@ -9,9 +8,6 @@ import makeo.gadomancy.common.network.packets.PacketStartAnimation; import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; import makeo.gadomancy.common.registration.RegisteredBlocks; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SoundHandler; -import net.minecraft.client.audio.SoundRegistry; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java index ef4d9cd..30ee4a7 100644 --- a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java @@ -1,8 +1,8 @@ package makeo.gadomancy.common.utils; -import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.golems.types.RemovedGolemType; import net.minecraftforge.common.util.EnumHelper; import thaumcraft.common.entities.golems.EnumGolemType; diff --git a/src/main/java/makeo/gadomancy/common/utils/JarMultiblockHandler.java b/src/main/java/makeo/gadomancy/common/utils/JarMultiblockHandler.java index 506edc3..909e870 100644 --- a/src/main/java/makeo/gadomancy/common/utils/JarMultiblockHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/JarMultiblockHandler.java @@ -1,8 +1,8 @@ package makeo.gadomancy.common.utils; -import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredIntegrations; import net.minecraft.block.Block; diff --git a/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java b/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java index 099960c..7be8e46 100644 --- a/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/MultiblockHelper.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.utils; import net.minecraft.block.Block; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import java.util.LinkedHashMap;