diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java index 2c681aca..68f4cbc0 100644 --- a/src/main/java/cofh/api/energy/IEnergyStorage.java +++ b/src/main/java/cofh/api/energy/IEnergyStorage.java @@ -3,7 +3,7 @@ package cofh.api.energy; /** * An energy internalGenBuffer is the unit of interaction with EnergyHelper inventories. * - * A reference implementation can be found at {@link com.brandon3055.draconicevolution.common.core.utills.EnergyStorage}. + * A reference implementation can be found at {@link com.brandon3055.draconicevolution.common.utills.EnergyStorage}. * * @author King Lemming * diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java index f8ca0387..e14186e8 100644 --- a/src/main/java/cofh/api/energy/TileEnergyHandler.java +++ b/src/main/java/cofh/api/energy/TileEnergyHandler.java @@ -1,6 +1,6 @@ package cofh.api.energy; -import com.brandon3055.draconicevolution.common.core.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java index 82597380..36009757 100644 --- a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java +++ b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution; import com.brandon3055.draconicevolution.client.creativetab.DETab; -import com.brandon3055.draconicevolution.common.core.proxy.CommonProxy; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.CommonProxy; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java similarity index 92% rename from src/main/java/com/brandon3055/draconicevolution/common/core/proxy/ClientProxy.java rename to src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java index 1e835b6a..b282683d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.proxy; +package com.brandon3055.draconicevolution.client; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; @@ -13,9 +13,10 @@ import com.brandon3055.draconicevolution.client.render.entity.RenderDragon; import com.brandon3055.draconicevolution.client.render.item.RenderBow; import com.brandon3055.draconicevolution.client.render.item.RenderMobSoul; import com.brandon3055.draconicevolution.client.render.tile.*; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.CommonProxy; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.entity.EntityCustomDragon; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.*; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon; @@ -38,31 +39,25 @@ public class ClientProxy extends CommonProxy { {if(debug) System.out.println("on Client side"); super.preInit(event); - - //Client Only - registerRendering(); + } @Override public void init(FMLInitializationEvent event) - {if(debug) - System.out.println("on Client side"); + { super.init(event); - //Client Only FMLCommonHandler.instance().bus().register(new KeyInputHandler()); FMLCommonHandler.instance().bus().register(new ClientEventHandler()); MinecraftForge.EVENT_BUS.register(new ToolHudHandler()); KeyBindings.init(); registerRenderIDs(); + registerRendering(); } @Override public void postInit(FMLPostInitializationEvent event) - {if(debug) - System.out.println("on Client side"); + { super.postInit(event); - - //Client Only } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java b/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java index 9c045b49..370d7bc5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.client.creativetab; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java index 29d67221..cd2e0b86 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java @@ -1,15 +1,12 @@ package com.brandon3055.draconicevolution.client.interfaces; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.config.IConfigElement; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; -import java.util.List; - /** * Created by Brandon on 6/08/2014. */ diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDissEnchanter.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDissEnchanter.java index 8615270f..4b8d7c67 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDissEnchanter.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDissEnchanter.java @@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.client.interfaces; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.manual.GuiButtonAHeight; import com.brandon3055.draconicevolution.common.container.ContainerDissEnchanter; -import com.brandon3055.draconicevolution.common.core.network.ButtonPacket; +import com.brandon3055.draconicevolution.common.network.ButtonPacket; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileDissEnchanter; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDraconiumChest.java index 89d20783..93797eb1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIDraconiumChest.java @@ -6,8 +6,8 @@ import codechicken.nei.api.TaggedInventoryArea; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.manual.GuiButtonAHeight; import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest; -import com.brandon3055.draconicevolution.common.core.network.ButtonPacket; -import com.brandon3055.draconicevolution.common.core.utills.GuiHelper; +import com.brandon3055.draconicevolution.common.network.ButtonPacket; +import com.brandon3055.draconicevolution.common.utills.GuiHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; import cpw.mods.fml.common.Optional; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIEnergyInfuser.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIEnergyInfuser.java index f8327c29..999ec5b4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIEnergyInfuser.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIEnergyInfuser.java @@ -2,7 +2,7 @@ package com.brandon3055.draconicevolution.client.interfaces; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.common.container.ContainerEnergyInfuser; -import com.brandon3055.draconicevolution.common.core.utills.GuiHelper; +import com.brandon3055.draconicevolution.common.utills.GuiHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileEnergyInfuser; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGenerator.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGenerator.java index d8487c32..83496213 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGenerator.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.client.interfaces; import com.brandon3055.draconicevolution.common.container.ContainerGenerator; -import com.brandon3055.draconicevolution.common.core.utills.GuiHelper; +import com.brandon3055.draconicevolution.common.utills.GuiHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileGenerator; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java index 039549ee..f0f4519e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.client.interfaces; import com.brandon3055.draconicevolution.common.container.ContainerGrinder; -import com.brandon3055.draconicevolution.common.core.utills.GuiHelper; +import com.brandon3055.draconicevolution.common.utills.GuiHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIParticleGenerator.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIParticleGenerator.java index 46135d05..35e84b42 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIParticleGenerator.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.client.interfaces; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.network.ParticleGenPacket; +import com.brandon3055.draconicevolution.common.network.ParticleGenPacket; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIPlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIPlayerDetector.java index 9ab3121b..b57e556d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIPlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIPlayerDetector.java @@ -2,8 +2,8 @@ package com.brandon3055.draconicevolution.client.interfaces; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.container.ContainerPlayerDetector; -import com.brandon3055.draconicevolution.common.core.network.PlayerDetectorButtonPacket; -import com.brandon3055.draconicevolution.common.core.network.PlayerDetectorStringPacket; +import com.brandon3055.draconicevolution.common.network.PlayerDetectorButtonPacket; +import com.brandon3055.draconicevolution.common.network.PlayerDetectorStringPacket; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUISunDial.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUISunDial.java index d4b4506b..71623ed1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUISunDial.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUISunDial.java @@ -12,7 +12,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.container.ContainerSunDial; -import com.brandon3055.draconicevolution.common.core.network.TeleporterPacket; +import com.brandon3055.draconicevolution.common.network.TeleporterPacket; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileSunDial; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java index cc65992b..42164da4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java @@ -2,13 +2,13 @@ package com.brandon3055.draconicevolution.client.interfaces; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.manual.GuiButtonAHeight; -import com.brandon3055.draconicevolution.common.core.Teleporter.Teleporter.TeleportLocation; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; -import com.brandon3055.draconicevolution.common.core.network.TeleporterPacket; -import com.brandon3055.draconicevolution.common.core.utills.GuiHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.utills.Teleporter.TeleportLocation; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.network.TeleporterPacket; +import com.brandon3055.draconicevolution.common.utills.GuiHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIWeatherController.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIWeatherController.java index faef74ae..be94ba32 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIWeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIWeatherController.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.container.ContainerWeatherController; -import com.brandon3055.draconicevolution.common.core.network.ButtonPacket; +import com.brandon3055.draconicevolution.common.network.ButtonPacket; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java index 1e982b73..6b5317e9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.client.interfaces.manual; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java index 681da24c..0a1beb89 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java @@ -1,9 +1,9 @@ package com.brandon3055.draconicevolution.client.keybinding; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.network.PlacedItemPacket; -import com.brandon3055.draconicevolution.common.core.network.TeleporterPacket; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.network.PlacedItemPacket; +import com.brandon3055.draconicevolution.common.network.TeleporterPacket; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.tools.ToolHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java index ccf14012..5f85027b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.client.render.block; -import com.brandon3055.draconicevolution.common.core.utills.ICustomItemData; +import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderMobSoul.java b/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderMobSoul.java index 3e1a8fb4..4adc073c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderMobSoul.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderMobSoul.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.client.render.item; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileTestBlock.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileTestBlock.java index cd619c88..ad442fa1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileTestBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileTestBlock.java @@ -1,11 +1,9 @@ package com.brandon3055.draconicevolution.client.render.tile; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileTestBlock; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java similarity index 91% rename from src/main/java/com/brandon3055/draconicevolution/common/core/proxy/CommonProxy.java rename to src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index e0827f7d..a8180d04 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -1,18 +1,17 @@ -package com.brandon3055.draconicevolution.common.core.proxy; +package com.brandon3055.draconicevolution.common; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.creativetab.DETab; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; -import com.brandon3055.draconicevolution.common.core.handler.CraftingHandler; -import com.brandon3055.draconicevolution.common.core.handler.FMLEventHandler; -import com.brandon3055.draconicevolution.common.core.handler.MinecraftForgeEventHandler; -import com.brandon3055.draconicevolution.common.core.network.*; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.core.utills.Utills; +import com.brandon3055.draconicevolution.common.achievements.Achievements; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.CraftingHandler; +import com.brandon3055.draconicevolution.common.handler.FMLEventHandler; +import com.brandon3055.draconicevolution.common.handler.MinecraftForgeEventHandler; +import com.brandon3055.draconicevolution.common.network.*; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.Utills; import com.brandon3055.draconicevolution.common.entity.*; -import com.brandon3055.draconicevolution.common.items.ModItems; import com.brandon3055.draconicevolution.common.lib.OreDoublingRegistry; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.magic.EnchantmentReaper; @@ -74,6 +73,7 @@ public class CommonProxy { } } + Achievements.addModAchievements(); LogHelper.info("Finished PreInitialization"); } @@ -90,6 +90,7 @@ public class CommonProxy { public void postInit(FMLPostInitializationEvent event) { OreDoublingRegistry.init(); + Achievements.registerAchievementPane(); LogHelper.info("Finished PostInitialization"); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/ModBlocks.java b/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java similarity index 94% rename from src/main/java/com/brandon3055/draconicevolution/common/blocks/ModBlocks.java rename to src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java index 07f6a8f9..fbd4c22e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/ModBlocks.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java @@ -1,14 +1,15 @@ -package com.brandon3055.draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common; +import com.brandon3055.draconicevolution.common.blocks.*; import com.brandon3055.draconicevolution.common.blocks.machine.*; import com.brandon3055.draconicevolution.common.blocks.multiblock.EnergyPylon; import com.brandon3055.draconicevolution.common.blocks.multiblock.EnergyStorageCore; import com.brandon3055.draconicevolution.common.blocks.multiblock.InvisibleMultiblock; -import com.brandon3055.draconicevolution.common.core.utills.Utills; +import com.brandon3055.draconicevolution.common.utills.Utills; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.common.registry.GameRegistry; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/ModItems.java b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java similarity index 97% rename from src/main/java/com/brandon3055/draconicevolution/common/items/ModItems.java rename to src/main/java/com/brandon3055/draconicevolution/common/ModItems.java index ea321bbf..b45a469a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/ModItems.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java @@ -1,5 +1,6 @@ -package com.brandon3055.draconicevolution.common.items; +package com.brandon3055.draconicevolution.common; +import com.brandon3055.draconicevolution.common.items.*; import com.brandon3055.draconicevolution.common.items.armor.DraconicArmor; import com.brandon3055.draconicevolution.common.items.armor.WyvernArmor; import com.brandon3055.draconicevolution.common.items.tools.*; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/achievements/Achievements.java b/src/main/java/com/brandon3055/draconicevolution/common/achievements/Achievements.java new file mode 100644 index 00000000..7f5b4d71 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/achievements/Achievements.java @@ -0,0 +1,64 @@ +package com.brandon3055.draconicevolution.common.achievements; + +import com.brandon3055.draconicevolution.common.ModItems; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.stats.Achievement; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.AchievementPage; + +import java.util.HashMap; + +/** + * Created by Brandon on 18/11/2014. + */ +public class Achievements { + + private static AchievementPage achievementsPage; + private static HashMap achievementsList = new HashMap(); + + public static void addAchievement (String name, Achievement achievement) + { + achievementsList.put(name, achievement.registerStat()); + } + + public static Achievement getAchievement (String name) + { + return achievementsList.get(name); + } + + public static void triggerAchievement (EntityPlayer player, String name) + { + + Achievement ach = getAchievement(name); + + if (ach != null) + { + player.triggerAchievement(ach); + } + } + + public static void addModAchievements() + { + addAchievement("draconicevolution.dust", new Achievement("draconicevolution.dust", "draconicevolution.dust", 0, 0, ModItems.draconiumDust, null).initIndependentStat()); //Mine Draconium Ore (pick up dust) + addAchievement("draconicevolution", new Achievement("draconicevolution", "draconicevolution", 2, 1, ModItems.draconiumDust, getAchievement("draconicevolution"))); + + + +// addAchievement("tconstruct.pattern", new Achievement("tconstruct.pattern", "tconstruct.pattern", 2, 1, TinkerTools.blankPattern, getAchievement("tconstruct.beginner"))); +// addAchievement("tconstruct.tinkerer", new Achievement("tconstruct.tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TinkerTools.titleIcon, 1, 4096), getAchievement("tconstruct.pattern"))); +// addAchievement("tconstruct.preparedFight", new Achievement("tconstruct.preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TinkerTools.titleIcon, 1, 4097), getAchievement("tconstruct.tinkerer"))); +// addAchievement("tconstruct.proTinkerer", new Achievement("tconstruct.proTinkerer", "tconstruct.proTinkerer", 4, 3, new ItemStack(TinkerTools.titleIcon, 1, 4098), getAchievement("tconstruct.tinkerer"))); +// addAchievement("tconstruct.smelteryMaker", new Achievement("tconstruct.smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TinkerSmeltery.smeltery, getAchievement("tconstruct.beginner"))); +// addAchievement("tconstruct.enemySlayer", new Achievement("tconstruct.enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TinkerTools.titleIcon, 1, 4099), getAchievement("tconstruct.preparedFight"))); +// addAchievement("tconstruct.dualConvenience", new Achievement("tconstruct.dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TinkerTools.titleIcon, 1, 4100), getAchievement("tconstruct.enemySlayer")).setSpecial()); + } + + public static void registerAchievementPane () + { + Achievement[] achievements = new Achievement[achievementsList.size()]; + + achievements = achievementsList.values().toArray(achievements); + achievementsPage = new AchievementPage(StatCollector.translateToLocal("draconicevolution.achievementPage.name"), achievements); + AchievementPage.registerAchievementPage(achievementsPage); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockContainerTemplate.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockContainerTemplate.java index cffff012..3531f54a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockContainerTemplate.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockContainerTemplate.java @@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileContainerTemplate; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java index 16c3a047..c71216a9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.blocks; -import com.brandon3055.draconicevolution.common.core.utills.InventoryUtils; +import com.brandon3055.draconicevolution.common.utills.InventoryUtils; import com.google.common.collect.Lists; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CKeyStone.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CKeyStone.java index 6f7c39ba..c24a2c86 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CKeyStone.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CKeyStone.java @@ -1,9 +1,10 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.itemblocks.CKeyStoneItemBlock; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileCKeyStone; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java index a772d8b5..0f566513 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java @@ -1,9 +1,10 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileCustomSpawner; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/Draconium.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/Draconium.java index a791b191..6cbfdf73 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/Draconium.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/Draconium.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.itemblocks.DraconiumItemBlock; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java index 09780d0d..410d19c1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java @@ -2,10 +2,11 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.itemblocks.DraconiumChestItemBlock; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; -import com.brandon3055.draconicevolution.common.core.utills.ICustomItemData; +import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java index e95c8ab3..91a242f3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java @@ -1,7 +1,8 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; @@ -82,4 +83,5 @@ public class DraconiumOre extends BlockDE { { return ModItems.draconiumDust; } + } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/ParticleGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/ParticleGenerator.java index 0fc07bb2..4b89cc82 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/ParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/ParticleGenerator.java @@ -3,7 +3,8 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.client.render.particle.ParticleCustom; -import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.handler.ParticleHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java index f280aa77..374b6df9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java @@ -1,5 +1,6 @@ package com.brandon3055.draconicevolution.common.blocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TilePlacedItem; import net.minecraft.block.Block; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/Potentiometer.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/Potentiometer.java index b14074df..bf2a5057 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/Potentiometer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/Potentiometer.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TilePotentiometer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/RainSensor.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/RainSensor.java index c2dc4fb5..e22e7315 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/RainSensor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/RainSensor.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/SafetyFlame.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/SafetyFlame.java index 4661b710..426fb91c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/SafetyFlame.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/SafetyFlame.java @@ -1,5 +1,6 @@ package com.brandon3055.draconicevolution.common.blocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import net.minecraft.block.BlockFire; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java index 42c7390d..0bc0680b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKI; import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKII; import com.brandon3055.draconicevolution.common.lib.References; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TestBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TestBlock.java index c37630e7..56aab029 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TestBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TestBlock.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.itemblocks.TestItemBlock; import com.brandon3055.draconicevolution.common.tileentities.TileTestBlock; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/XRayBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/XRayBlock.java index 87ba6f65..9bad0668 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/XRayBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/XRayBlock.java @@ -1,8 +1,9 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/ItemBlockCustomData.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/ItemBlockCustomData.java index 17ef0093..525fb27a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/ItemBlockCustomData.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/ItemBlockCustomData.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.blocks.itemblocks; -import com.brandon3055.draconicevolution.common.core.utills.ICustomItemData; +import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DissEnchanter.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DissEnchanter.java index bbf281ed..f1bdb3af 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DissEnchanter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DissEnchanter.java @@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.common.blocks.BlockCustomDrop; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileDissEnchanter; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyInfuser.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyInfuser.java index 21f3ab24..67d2918c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyInfuser.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyInfuser.java @@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.common.blocks.BlockCustomDrop; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileEnergyInfuser; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java index afd75a4a..3140a069 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Generator.java @@ -3,8 +3,8 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.common.blocks.BlockCustomDrop; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileGenerator; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java index 42932b2e..ad200b21 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/Grinder.java @@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.common.blocks.BlockCustomDrop; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/LongRangeDislocator.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/LongRangeDislocator.java index 1814474e..7feeba4d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/LongRangeDislocator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/LongRangeDislocator.java @@ -3,9 +3,9 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.blocks.BlockDE; import com.brandon3055.draconicevolution.common.blocks.itemblocks.LRDItemBlock; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetector.java index 74bfdb96..8737c937 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetector.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.common.blocks.BlockDE; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetectorAdvanced.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetectorAdvanced.java index f51dee12..28d3803a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetectorAdvanced.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/PlayerDetectorAdvanced.java @@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.common.blocks.BlockCustomDrop; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/SunDial.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/SunDial.java index 9a476f80..fbc9b922 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/SunDial.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/SunDial.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.common.blocks.BlockDE; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java index f824fbae..ef38ae54 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/WeatherController.java @@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.blocks.machine; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.common.blocks.BlockCustomDrop; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyPylon.java index 9c286dff..9d529214 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyPylon.java @@ -2,8 +2,8 @@ package com.brandon3055.draconicevolution.common.blocks.multiblock; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.blocks.BlockDE; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java index 2cdd7e76..45e8729d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java @@ -2,9 +2,9 @@ package com.brandon3055.draconicevolution.common.blocks.multiblock; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.blocks.BlockDE; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.core.utills.Utills; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.Utills; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java index 5077f8b8..17495483 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java @@ -1,9 +1,9 @@ package com.brandon3055.draconicevolution.common.blocks.multiblock; import com.brandon3055.draconicevolution.common.blocks.BlockDE; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.core.utills.Utills; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.Utills; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDataSync.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDataSync.java index efcbe55e..68040d56 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDataSync.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDataSync.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.container; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; import com.brandon3055.draconicevolution.common.tileentities.TileObjectSync; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDissEnchanter.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDissEnchanter.java index 4faf6b30..8fc62b16 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDissEnchanter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDissEnchanter.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.container; import com.brandon3055.draconicevolution.common.inventory.SlotOutput; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.tileentities.TileDissEnchanter; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerEnergyInfuser.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerEnergyInfuser.java index 6b930352..0335a01d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerEnergyInfuser.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerEnergyInfuser.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.container; import cofh.api.energy.IEnergyContainerItem; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; import com.brandon3055.draconicevolution.common.inventory.SlotChargable; import com.brandon3055.draconicevolution.common.tileentities.TileEnergyInfuser; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java index d45084a7..d7f9b9ae 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.container; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; import com.brandon3055.draconicevolution.common.inventory.SlotItemValid; import com.brandon3055.draconicevolution.common.tileentities.TileGenerator; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java index 1645d1f8..fc56217c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.container; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; import com.brandon3055.draconicevolution.common.inventory.SlotItemValid; import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosDrill.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosDrill.java index c83ebaf6..b17e7b2a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosDrill.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosDrill.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.common.entity; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.core.utills.Utills; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.Utills; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java index eb3d0578..97b52a66 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.entity; -import com.brandon3055.draconicevolution.common.core.utills.DamageSourceChaos; +import com.brandon3055.draconicevolution.common.utills.DamageSourceChaos; import net.minecraft.block.Block; import net.minecraft.block.BlockEndPortal; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java index 909b8ef7..d7d9cdd7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.entity; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java index e6ec5b3e..14b2a792 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.entity; -import com.brandon3055.draconicevolution.common.core.utills.Utills; +import com.brandon3055.draconicevolution.common.utills.Utills; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java similarity index 98% rename from src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java rename to src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java index 048d28a4..8d81f927 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java @@ -1,6 +1,6 @@ -package com.brandon3055.draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.handler; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraftforge.common.config.Configuration; import java.io.File; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java similarity index 96% rename from src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java rename to src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java index 9c67854b..d8e0b39e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java @@ -1,9 +1,9 @@ -package com.brandon3055.draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.handler; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.armor.DraconicArmor; import com.brandon3055.draconicevolution.common.items.armor.WyvernArmor; import com.brandon3055.draconicevolution.common.items.tools.*; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/FMLEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java similarity index 95% rename from src/main/java/com/brandon3055/draconicevolution/common/core/handler/FMLEventHandler.java rename to src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java index e1f14a2a..79a93f59 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/FMLEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java @@ -1,7 +1,7 @@ -package com.brandon3055.draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.handler; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.items.armor.ArmorEffectHandler; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.client.event.ConfigChangedEvent; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/MinecraftForgeEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java similarity index 95% rename from src/main/java/com/brandon3055/draconicevolution/common/core/handler/MinecraftForgeEventHandler.java rename to src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java index 18a35cb4..a8f2af5f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/MinecraftForgeEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java @@ -1,12 +1,12 @@ -package com.brandon3055.draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.handler; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.entity.EntityCustomDragon; import com.brandon3055.draconicevolution.common.entity.ExtendedPlayer; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.armor.ArmorEffectHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.block.Block; @@ -105,7 +105,7 @@ public class MinecraftForgeEventHandler { int rand = random.nextInt(Math.max(ConfigHandler.soulDropChance / dropChanceModifier, 1)); int rand2 = random.nextInt(Math.max(ConfigHandler.passiveSoulDropChance / dropChanceModifier, 1)); boolean isAnimal = entity instanceof EntityAnimal; - + LogHelper.info(dropChanceModifier+" "+rand); if ((rand == 0 && !isAnimal) || (rand2 == 0 && isAnimal)) { ItemStack soul = new ItemStack(ModItems.mobSoul); String name = EntityList.getEntityString(entity); @@ -215,7 +215,7 @@ public class MinecraftForgeEventHandler { boolean flag = false; - for (int i = 0; i < list.size(); ++i) { + for (int i = 0; i < list.size(); ++i) {//TODO tidy up and use for each aswell as reflection to access becomeAngryAt Entity entity1 = (Entity) list.get(i); if (entity1 instanceof EntityPigZombie) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ParticleHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ParticleHandler.java similarity index 97% rename from src/main/java/com/brandon3055/draconicevolution/common/core/handler/ParticleHandler.java rename to src/main/java/com/brandon3055/draconicevolution/common/handler/ParticleHandler.java index 75dd84bc..7e3f9d7d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ParticleHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ParticleHandler.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.handler; import com.brandon3055.draconicevolution.client.render.particle.ParticleDistortion; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCompound.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCompound.java index a7992f42..5e4cea5d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCompound.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCompound.java @@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.common.items; import java.util.List; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java index e4754cef..508de387 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java @@ -1,8 +1,9 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumBlend.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumBlend.java index 9f535371..6c0a4745 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumBlend.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumBlend.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconiumBlend extends ItemDE { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumDust.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumDust.java index bb7ae178..c2196271 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumDust.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumDust.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconiumDust extends ItemDE { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumIngot.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumIngot.java index 0f0b221c..a4a224df 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumIngot.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumIngot.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconiumIngot extends ItemDE { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/DragonHeart.java b/src/main/java/com/brandon3055/draconicevolution/common/items/DragonHeart.java index d6cd138a..ac2e2df3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DragonHeart.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DragonHeart.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; public class DragonHeart extends ItemDE { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java index 949c8d7f..1674e1d9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java @@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/InfusedCompound.java b/src/main/java/com/brandon3055/draconicevolution/common/items/InfusedCompound.java index 5d5a4fcc..570d9f73 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/InfusedCompound.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/InfusedCompound.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; public class InfusedCompound extends ItemDE { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/Key.java b/src/main/java/com/brandon3055/draconicevolution/common/items/Key.java index 85b22150..3fefc340 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/Key.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/Key.java @@ -1,7 +1,8 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/MobSoul.java b/src/main/java/com/brandon3055/draconicevolution/common/items/MobSoul.java index 8c6845cd..4580505e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/MobSoul.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/MobSoul.java @@ -1,7 +1,8 @@ package com.brandon3055.draconicevolution.common.items; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java b/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java index 776b79aa..2c674cf6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; public class SunFocus extends ItemDE { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java index bb97a92a..1b9ca234 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java @@ -1,6 +1,8 @@ package com.brandon3055.draconicevolution.common.items; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.achievements.Achievements; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -10,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; import java.util.List; @@ -74,6 +77,37 @@ public class Tclogo extends ItemDE { { //if (!world.isRemote)OreDoublingRegistry.getOreResult(GameRegistry.findItemStack("ThermalFoundation", "oreCopper", 1)); + player.triggerAchievement(Achievements.getAchievement("Draconium Ore")); + //player.fallDistance = 0; + //player.motionY+=1; + //player.moveFlying(0f, 0f, 1f); + float horizontal = 0f; + float forward = 1f; + float acceleration = 1f; + + float f3 = forward * forward; + + if (f3 >= 1.0E-4F) + { + f3 = MathHelper.sqrt_float(f3); + + if (f3 < 1.0F) + { + f3 = 1.0F; + } + + f3 = acceleration / f3; + horizontal *= f3; + forward *= f3; + float f4 = MathHelper.sin(player.rotationYaw * (float)Math.PI / 180.0F); + float f5 = MathHelper.cos(player.rotationYaw * (float) Math.PI / 180.0F); + float f6 = (player.rotationPitch-20) * (float) Math.PI / 180.0F; + player.motionX += (double)( - forward * f4); + player.motionY += (double)(f6*-1); + player.motionZ += (double)(forward * f5); + } + + // player.addPotionEffect(new PotionEffect(PotionHandler.potionFlight.id, 100, 0)); // player.addPotionEffect(new PotionEffect(PotionHandler.potionFireResist.id, 100, 1)); // player.addPotionEffect(new PotionEffect(PotionHandler.potionSpeed.id, 100, 1)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index e1b4cc52..0ec58afd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.armor; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java index cb0c2a74..7766cbe8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.armor; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java index 209d7ff9..5a6a916e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/AdminSpawnEgg.java @@ -1,10 +1,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.items.ItemDE; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java index 03b0d43f..ff06dacc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/CreativeStructureSpawner.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.draconicevolution.common.items.ItemDE; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.world.WorldGenEnderComet; import com.brandon3055.draconicevolution.common.world.WorldGenEnderIsland; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java index 1d332a62..fc6db457 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java index 0ef394c7..87eb7877 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.google.common.collect.Multimap; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java index 7d131330..8b147fab 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.eventhandler.Event.Result; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java index d5fc6470..4b981648 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java index 6eb6fbc9..84114b04 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java index 82512123..c8713de7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/EnderArrow.java @@ -2,7 +2,7 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.items.ItemDE; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ObliterationCatalyst.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ObliterationCatalyst.java index 8e863fb7..a2ddd89f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ObliterationCatalyst.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ObliterationCatalyst.java @@ -1,10 +1,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.entity.EntityChaosDrill; import com.brandon3055.draconicevolution.common.items.ItemDE; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java index 2a4c33de..25cb55e2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/SafetyMatch.java @@ -1,10 +1,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; import com.brandon3055.draconicevolution.common.items.ItemDE; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java index 21c65b0e..389c5cb9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java @@ -1,11 +1,11 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.Teleporter.Teleporter; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.Teleporter; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; import com.brandon3055.draconicevolution.common.items.ItemDE; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java index be0b8517..2ef6d4f2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKII.java @@ -3,11 +3,11 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.handler.ToolHudHandler; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; -import com.brandon3055.draconicevolution.common.core.Teleporter.Teleporter.TeleportLocation; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.Teleporter.TeleportLocation; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; import com.brandon3055.draconicevolution.common.items.ItemDE; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ToolHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ToolHandler.java index 7a262d28..c6ab4e0f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ToolHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/ToolHandler.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java index aee64396..094c7478 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java index 673c8ee1..b01b8ee3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.tools; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java index b55d8f2d..7cb99b42 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java @@ -2,7 +2,7 @@ package com.brandon3055.draconicevolution.common.items.weapons; import com.brandon3055.draconicevolution.common.entity.EntityDraconicArrow; import com.brandon3055.draconicevolution.common.entity.EntityEnderArrow; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java index f0ec5cf4..7d8498d5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java @@ -1,10 +1,10 @@ package com.brandon3055.draconicevolution.common.items.weapons; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java index b379c44c..1335c3bd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.weapons; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.tools.ToolHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java index f574769d..ed911fcc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java @@ -1,10 +1,10 @@ package com.brandon3055.draconicevolution.common.items.weapons; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java index b97be00d..dc1b4907 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java @@ -2,10 +2,10 @@ package com.brandon3055.draconicevolution.common.items.weapons; import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.tools.ToolHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/OreDoublingRegistry.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/OreDoublingRegistry.java index 2a74b4c9..269c4106 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/OreDoublingRegistry.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/OreDoublingRegistry.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.lib; import com.brandon3055.draconicevolution.common.items.DraconiumBlend; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModItems; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java index 4a542422..87865911 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java @@ -5,8 +5,8 @@ public final class References { public static final String MODNAME = "Draconic Evolution"; public static final String VERSION = "0.9.5-Beta"; public static final String MCVERSION = "1.7.10"; - public static final String CLIENTPROXYLOCATION = "com.brandon3055.draconicevolution.common.core.proxy.ClientProxy"; - public static final String COMMONPROXYLOCATION = "com.brandon3055.draconicevolution.common.core.proxy.CommonProxy"; + public static final String CLIENTPROXYLOCATION = "com.brandon3055.draconicevolution.client.ClientProxy"; + public static final String COMMONPROXYLOCATION = "com.brandon3055.draconicevolution.common.CommonProxy"; public static final String GUIFACTORY = "com.brandon3055.draconicevolution.client.interfaces.DEGUIFactory"; public static final String RESOURCESPREFIX = MODID.toLowerCase() + ":"; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java similarity index 98% rename from src/main/java/com/brandon3055/draconicevolution/common/core/network/ButtonPacket.java rename to src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java index c7a6c895..8138ddec 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.network; import com.brandon3055.draconicevolution.common.container.ContainerDissEnchanter; import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ObjectPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/ObjectPacket.java similarity index 98% rename from src/main/java/com/brandon3055/draconicevolution/common/core/network/ObjectPacket.java rename to src/main/java/com/brandon3055/draconicevolution/common/network/ObjectPacket.java index 5b33202a..8276841a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ObjectPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ObjectPacket.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.network; import com.brandon3055.draconicevolution.common.container.ContainerDataSync; import com.brandon3055.draconicevolution.common.tileentities.TileObjectSync; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ParticleGenPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/ParticleGenPacket.java similarity index 99% rename from src/main/java/com/brandon3055/draconicevolution/common/core/network/ParticleGenPacket.java rename to src/main/java/com/brandon3055/draconicevolution/common/network/ParticleGenPacket.java index 4099ebef..cbb4f9e7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ParticleGenPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ParticleGenPacket.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.network; import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlacedItemPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/PlacedItemPacket.java similarity index 94% rename from src/main/java/com/brandon3055/draconicevolution/common/core/network/PlacedItemPacket.java rename to src/main/java/com/brandon3055/draconicevolution/common/network/PlacedItemPacket.java index c37f1ad6..e59737ea 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlacedItemPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/PlacedItemPacket.java @@ -1,6 +1,6 @@ -package com.brandon3055.draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.network; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.tileentities.TilePlacedItem; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/PlayerDetectorButtonPacket.java similarity index 96% rename from src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorButtonPacket.java rename to src/main/java/com/brandon3055/draconicevolution/common/network/PlayerDetectorButtonPacket.java index 7e5567ea..f085a067 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/PlayerDetectorButtonPacket.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.network; import com.brandon3055.draconicevolution.common.container.ContainerPlayerDetector; import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorStringPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/PlayerDetectorStringPacket.java similarity index 96% rename from src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorStringPacket.java rename to src/main/java/com/brandon3055/draconicevolution/common/network/PlayerDetectorStringPacket.java index c413d148..37faa54c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorStringPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/PlayerDetectorStringPacket.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.network; import com.brandon3055.draconicevolution.common.container.ContainerPlayerDetector; import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/TeleporterPacket.java similarity index 94% rename from src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterPacket.java rename to src/main/java/com/brandon3055/draconicevolution/common/network/TeleporterPacket.java index 5a94f205..17d9f7bd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/TeleporterPacket.java @@ -1,10 +1,10 @@ -package com.brandon3055.draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.network; -import com.brandon3055.draconicevolution.common.core.Teleporter.Teleporter.TeleportLocation; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.utills.Teleporter.TeleportLocation; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModItems; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/CraftingChestStackPositioner.java b/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/CraftingChestStackPositioner.java index 6337216b..e59b7f59 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/CraftingChestStackPositioner.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/CraftingChestStackPositioner.java @@ -4,7 +4,7 @@ import codechicken.nei.PositionedStack; import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.GuiRecipe; import com.brandon3055.draconicevolution.client.interfaces.GUIDraconiumChest; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraft.client.Minecraft; import java.util.ArrayList; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/NEIDraconicevolutionConfig.java b/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/NEIDraconicevolutionConfig.java index 55b96f5f..c0b1a6b4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/NEIDraconicevolutionConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/plugins/nei/NEIDraconicevolutionConfig.java @@ -3,9 +3,9 @@ package com.brandon3055.draconicevolution.common.plugins.nei; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import com.brandon3055.draconicevolution.client.interfaces.GUIDraconiumChest; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCKeyStone.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCKeyStone.java index c6fb3440..98cb1635 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCKeyStone.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCKeyStone.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.tileentities; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; -import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.ModItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCustomSpawner.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCustomSpawner.java index a1409a3b..9b041813 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCustomSpawner.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileCustomSpawner.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.common.tileentities; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergy; -import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java index 887556f1..23a182c3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDissEnchanter.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.tileentities; -import com.brandon3055.draconicevolution.common.core.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java index f2728d73..b703b078 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java @@ -2,12 +2,12 @@ package com.brandon3055.draconicevolution.common.tileentities; import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.IEnergyHandler; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest; -import com.brandon3055.draconicevolution.common.core.utills.EnergyStorage; -import com.brandon3055.draconicevolution.common.core.utills.ICustomItemData; -import com.brandon3055.draconicevolution.common.core.utills.InventoryUtils; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.utills.ICustomItemData; +import com.brandon3055.draconicevolution.common.utills.InventoryUtils; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.lib.OreDoublingRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileEnergyInfuser.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileEnergyInfuser.java index 0127c522..87d3a613 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileEnergyInfuser.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileEnergyInfuser.java @@ -3,9 +3,9 @@ package com.brandon3055.draconicevolution.common.tileentities; import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.IEnergyHandler; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergy; -import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; -import com.brandon3055.draconicevolution.common.core.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGenerator.java index a703b46d..cb0bb3de 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGenerator.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.common.tileentities; import cofh.api.energy.IEnergyHandler; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; -import com.brandon3055.draconicevolution.common.core.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java index fa4f0862..f0a2634c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.common.tileentities; import cofh.api.energy.IEnergyHandler; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; -import com.brandon3055.draconicevolution.common.core.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileObjectSync.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileObjectSync.java index e50a858f..5fa9ccf9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileObjectSync.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileObjectSync.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.tileentities; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.common.core.network.ObjectPacket; +import com.brandon3055.draconicevolution.common.network.ObjectPacket; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java index 370493e7..beb2e7fd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java @@ -3,7 +3,7 @@ package com.brandon3055.draconicevolution.common.tileentities; import com.brandon3055.draconicevolution.client.render.particle.ParticleCustom; import com.brandon3055.draconicevolution.client.render.particle.Particles; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation; -import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.handler.ParticleHandler; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlacedItem.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlacedItem.java index 81eb02f6..8dc0b761 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlacedItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlacedItem.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.tileentities; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java index da5ea85a..cbfd69c9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java @@ -2,7 +2,7 @@ package com.brandon3055.draconicevolution.common.tileentities; import static net.minecraftforge.common.util.ForgeDirection.UP; -import com.brandon3055.draconicevolution.common.core.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import cofh.api.energy.IEnergyHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnderResurrection.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnderResurrection.java index 6d6b47ea..20d8fdf9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnderResurrection.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnderResurrection.java @@ -1,10 +1,10 @@ package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles; import com.brandon3055.draconicevolution.client.render.particle.Particles.AdvancedSeekerParticle; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper; -import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.entity.EntityCustomDragon; import com.brandon3055.draconicevolution.common.entity.ExtendedPlayer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java index 71a7e569..a162c2f0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java @@ -1,11 +1,11 @@ package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles; -import com.brandon3055.draconicevolution.common.core.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import cofh.api.energy.IEnergyHandler; import com.brandon3055.draconicevolution.client.render.particle.Particles; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation; -import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.handler.ParticleHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java index 84e24c17..4892c075 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java index df9b8b26..adf37d26 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java @@ -1,15 +1,14 @@ package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; /** * Created by Brandon on 26/07/2014. diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/Teleporter/CustomTeleporter.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/CustomTeleporter.java similarity index 93% rename from src/main/java/com/brandon3055/draconicevolution/common/core/Teleporter/CustomTeleporter.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/CustomTeleporter.java index 30c37219..05b46a8f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/Teleporter/CustomTeleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/CustomTeleporter.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.Teleporter; +package com.brandon3055.draconicevolution.common.utills; import net.minecraft.entity.Entity; import net.minecraft.world.Teleporter; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/DamageSourceChaos.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/DamageSourceChaos.java similarity index 91% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/DamageSourceChaos.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/DamageSourceChaos.java index fc63fcee..1df398a5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/DamageSourceChaos.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/DamageSourceChaos.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/EnergyStorage.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/EnergyStorage.java similarity index 98% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/EnergyStorage.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/EnergyStorage.java index fe6c307f..00e2b213 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/EnergyStorage.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/EnergyStorage.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; import cofh.api.energy.IEnergyStorage; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/GuiHelper.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/GuiHelper.java similarity index 80% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/GuiHelper.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/GuiHelper.java index f4007f3d..8c5129aa 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/GuiHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/GuiHelper.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; /** * Created by Brandon on 28/06/2014. diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/ICustomItemData.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/ICustomItemData.java similarity index 84% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/ICustomItemData.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/ICustomItemData.java index 02c53907..6c1313e0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/ICustomItemData.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/ICustomItemData.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InfoHelper.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/InfoHelper.java similarity index 97% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/InfoHelper.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/InfoHelper.java index b35de458..c14c4710 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InfoHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/InfoHelper.java @@ -1,7 +1,7 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; import cofh.api.energy.IEnergyContainerItem; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InventoryUtils.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/InventoryUtils.java similarity index 99% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/InventoryUtils.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/InventoryUtils.java index 7de1f085..33bce83d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InventoryUtils.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/InventoryUtils.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; /** * Everything in this class is copied from openblocks diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/ItemNBTHelper.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/ItemNBTHelper.java similarity index 98% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/ItemNBTHelper.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/ItemNBTHelper.java index 72521bdd..8a43b1ba 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/ItemNBTHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/ItemNBTHelper.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/LogHelper.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/LogHelper.java similarity index 88% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/LogHelper.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/LogHelper.java index bdeb78d6..8258a0f6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/LogHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/LogHelper.java @@ -1,6 +1,5 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; -import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.lib.References; import cpw.mods.fml.common.FMLLog; import org.apache.logging.log4j.Level; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/Teleporter/Teleporter.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/Teleporter.java similarity index 98% rename from src/main/java/com/brandon3055/draconicevolution/common/core/Teleporter/Teleporter.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/Teleporter.java index 62c6ce52..11598c47 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/Teleporter/Teleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/Teleporter.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.Teleporter; +package com.brandon3055.draconicevolution.common.utills; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/Utills.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/Utills.java similarity index 98% rename from src/main/java/com/brandon3055/draconicevolution/common/core/utills/Utills.java rename to src/main/java/com/brandon3055/draconicevolution/common/utills/Utills.java index c37322e7..45703325 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/Utills.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/Utills.java @@ -1,4 +1,4 @@ -package com.brandon3055.draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.utills; import com.brandon3055.draconicevolution.common.blocks.BlockDE; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java index d8ba4cde..3eccdeed 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.common.world; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; -import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import cpw.mods.fml.common.IWorldGenerator; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderComet.java b/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderComet.java index 5309d6e8..4adec634 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderComet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderComet.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.world; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderIsland.java b/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderIsland.java index de84c787..a81d0311 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderIsland.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/world/WorldGenEnderIsland.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.common.world; -import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.entity.EntityCustomDragon; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.init.Blocks;