diff --git a/build.gradle b/build.gradle index 300eb7ed..303d0c4f 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.2-v0.9.1-Beta-Pre10" +version = "1.7.2-v0.9.2-Beta" group= "com.brandon3055.draconicevolution" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Draconic-Evolution" diff --git a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java index a5a075ee..c00b6bfe 100644 --- a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java +++ b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java @@ -1,4 +1,4 @@ -package draconicevolution; +package com.brandon3055.draconicevolution; import java.util.Arrays; @@ -12,10 +12,10 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.FMLEventChannel; -import draconicevolution.client.creativetab.TolkienTab; -import draconicevolution.common.core.network.ChannelHandler; -import draconicevolution.common.core.proxy.CommonProxy; -import draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.client.creativetab.TolkienTab; +import com.brandon3055.draconicevolution.common.core.network.ChannelHandler; +import com.brandon3055.draconicevolution.common.core.proxy.CommonProxy; +import com.brandon3055.draconicevolution.common.lib.References; @Mod(modid = References.MODID, name = References.MODNAME, version = References.VERSION) public class DraconicEvolution { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/creativetab/TolkienTab.java b/src/main/java/com/brandon3055/draconicevolution/client/creativetab/TolkienTab.java index 7832fe95..abfa6a5f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/creativetab/TolkienTab.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/creativetab/TolkienTab.java @@ -1,8 +1,8 @@ -package draconicevolution.client.creativetab; +package com.brandon3055.draconicevolution.client.creativetab; -import draconicevolution.common.blocks.ModBlocks; -import draconicevolution.common.core.handler.ConfigHandler; -import draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.items.ModItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/CustomGuiButton.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/CustomGuiButton.java index 84f75b41..a4a1d9f7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/CustomGuiButton.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/CustomGuiButton.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import org.lwjgl.opengl.GL11; 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 ff9d4f9e..a2c1372c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -11,9 +11,9 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.common.container.ContainerGrinder; -import draconicevolution.common.lib.References; -import draconicevolution.common.tileentities.TileGrinder; +import com.brandon3055.draconicevolution.common.container.ContainerGrinder; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; @SideOnly(Side.CLIENT) public class GUIGrinder extends GuiContainer { 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 d81c55e1..6618c411 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIParticleGenerator.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import java.util.ArrayList; @@ -12,10 +12,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.network.ParticleGenPacket; -import draconicevolution.common.lib.References; -import draconicevolution.common.tileentities.TileParticleGenerator; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.network.ParticleGenPacket; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; public class GUIParticleGenerator extends GuiScreen { 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 5add2767..994cf768 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIPlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIPlayerDetector.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import java.util.ArrayList; @@ -14,12 +14,12 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.container.ContainerPlayerDetector; -import draconicevolution.common.core.network.PlayerDetectorButtonPacket; -import draconicevolution.common.core.network.PlayerDetectorStringPacket; -import draconicevolution.common.lib.References; -import draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; +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.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; @SideOnly(Side.CLIENT) public class GUIPlayerDetector extends GuiContainer diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIReader.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIReader.java index 03f8bbae..3a751195 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIReader.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIReader.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.IInventory; @@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.common.container.ContainerReader; -import draconicevolution.common.core.utills.InventoryReader; +import com.brandon3055.draconicevolution.common.container.ContainerReader; +import com.brandon3055.draconicevolution.common.core.utills.InventoryReader; @SideOnly(Side.CLIENT) public class GUIReader extends GuiContainer { 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 0c46ed63..5df3c3e2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUISunDial.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUISunDial.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -10,11 +10,11 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.container.ContainerSunDial; -import draconicevolution.common.core.network.TeleporterPacket; -import draconicevolution.common.lib.References; -import draconicevolution.common.tileentities.TileSunDial; +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.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.TileSunDial; @SideOnly(Side.CLIENT) public class GUISunDial extends GuiContainer { 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 9b804abc..362198cf 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -16,13 +16,13 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.handler.ConfigHandler; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.core.network.TeleporterPacket; -import draconicevolution.common.core.network.TeleporterStringPacket; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.core.network.TeleporterPacket; +import com.brandon3055.draconicevolution.common.core.network.TeleporterStringPacket; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; @SideOnly(Side.CLIENT) public class GUITeleporter extends GuiScreen 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 652de8df..6b87b671 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIWeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIWeatherController.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -11,11 +11,11 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.container.ContainerWeatherController; -import draconicevolution.common.core.network.ButtonPacket; -import draconicevolution.common.lib.References; -import draconicevolution.common.tileentities.TileWeatherController; +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.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; @SideOnly(Side.CLIENT) public class GUIWeatherController extends GuiContainer { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GuiHandler.java index f88dce26..38d01ca4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GuiHandler.java @@ -1,22 +1,22 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; -import draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.DraconicEvolution; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import draconicevolution.common.container.ContainerGrinder; -import draconicevolution.common.container.ContainerPlayerDetector; -import draconicevolution.common.container.ContainerReader; -import draconicevolution.common.container.ContainerSunDial; -import draconicevolution.common.container.ContainerWeatherController; -import draconicevolution.common.core.utills.InventoryReader; -import draconicevolution.common.tileentities.TileGrinder; -import draconicevolution.common.tileentities.TileParticleGenerator; -import draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; -import draconicevolution.common.tileentities.TileSunDial; -import draconicevolution.common.tileentities.TileWeatherController; +import com.brandon3055.draconicevolution.common.container.ContainerGrinder; +import com.brandon3055.draconicevolution.common.container.ContainerPlayerDetector; +import com.brandon3055.draconicevolution.common.container.ContainerReader; +import com.brandon3055.draconicevolution.common.container.ContainerSunDial; +import com.brandon3055.draconicevolution.common.container.ContainerWeatherController; +import com.brandon3055.draconicevolution.common.core.utills.InventoryReader; +import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; +import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; +import com.brandon3055.draconicevolution.common.tileentities.TileSunDial; +import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotItemValid.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotItemValid.java index 44712e33..71ea99c2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotItemValid.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotItemValid.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotOpaqueBlock.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotOpaqueBlock.java index 935f81b4..fa674a46 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotOpaqueBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/SlotOpaqueBlock.java @@ -1,4 +1,4 @@ -package draconicevolution.client.interfaces; +package com.brandon3055.draconicevolution.client.interfaces; import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/BowRenderer.java b/src/main/java/com/brandon3055/draconicevolution/client/render/BowRenderer.java index ed3ce6d5..f59af987 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/BowRenderer.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/BowRenderer.java @@ -1,4 +1,4 @@ -package draconicevolution.client.render; +package com.brandon3055.draconicevolution.client.render; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/CustomParticle.java b/src/main/java/com/brandon3055/draconicevolution/client/render/CustomParticle.java index 317483f5..9a890b2f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/CustomParticle.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/CustomParticle.java @@ -1,4 +1,4 @@ -package draconicevolution.client.render; +package com.brandon3055.draconicevolution.client.render; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.References; public class CustomParticle extends EntityFX { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/DistortionParticle.java b/src/main/java/com/brandon3055/draconicevolution/client/render/DistortionParticle.java index 2a67be03..aceddce8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/DistortionParticle.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/DistortionParticle.java @@ -1,4 +1,4 @@ -package draconicevolution.client.render; +package com.brandon3055.draconicevolution.client.render; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.References; public class DistortionParticle extends EntityFX { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/ItemParticleGenRenderer.java b/src/main/java/com/brandon3055/draconicevolution/client/render/ItemParticleGenRenderer.java index 23411e5a..dc6976f2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/ItemParticleGenRenderer.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/ItemParticleGenRenderer.java @@ -1,4 +1,4 @@ -package draconicevolution.client.render; +package com.brandon3055.draconicevolution.client.render; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/ParticleGenRenderer.java b/src/main/java/com/brandon3055/draconicevolution/client/render/ParticleGenRenderer.java index b539dc2f..7ba95897 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/ParticleGenRenderer.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/ParticleGenRenderer.java @@ -1,4 +1,4 @@ -package draconicevolution.client.render; +package com.brandon3055.draconicevolution.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; @@ -10,8 +10,8 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import draconicevolution.common.lib.References; -import draconicevolution.common.tileentities.TileParticleGenerator; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; public class ParticleGenRenderer extends TileEntitySpecialRenderer { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockSunDial.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockSunDial.java index 283034c4..f7a4ecc6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockSunDial.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockSunDial.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,10 +9,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; -import draconicevolution.common.tileentities.TileSunDial; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.TileSunDial; public class BlockSunDial extends TolkienBlock { //@SideOnly(Side.CLIENT) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockWeatherController.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockWeatherController.java index b9634916..678d37a9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockWeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockWeatherController.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import java.util.List; @@ -20,11 +20,11 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.client.interfaces.GuiHandler; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; -import draconicevolution.common.tileentities.TileWeatherController; +import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; public class BlockWeatherController extends BlockContainer { 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 f10716ef..a59d120f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import java.util.Random; @@ -11,10 +11,10 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; import net.minecraft.world.IBlockAccess; public class DraconiumOre extends TolkienBlock { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/Grinder.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/Grinder.java index 6d63a9fe..a0763eef 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/Grinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/Grinder.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import java.util.List; @@ -22,11 +22,11 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.client.interfaces.GuiHandler; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; -import draconicevolution.common.tileentities.TileGrinder; +import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; public class Grinder extends BlockContainer { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/MobSpawner.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/MobSpawner.java new file mode 100644 index 00000000..a54a9245 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/MobSpawner.java @@ -0,0 +1,15 @@ +package com.brandon3055.draconicevolution.common.blocks; + +import net.minecraft.block.material.Material; +import sun.org.mozilla.javascript.internal.ast.Block; + +/** + * Created by Brandon on 21/06/2014. + */ +public class MobSpawner extends Block { + public MobSpawner() + { + + } + +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/ModBlocks.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/ModBlocks.java index 51356cf1..3806b905 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/ModBlocks.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/ModBlocks.java @@ -1,9 +1,9 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; public class ModBlocks { public static Block xRayBlock; 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 2a4a99ab..2ddc81e7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/ParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/ParticleGenerator.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import java.util.Random; @@ -13,13 +13,13 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.client.interfaces.GuiHandler; -import draconicevolution.client.render.CustomParticle; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.handler.ParticleHandler; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; -import draconicevolution.common.tileentities.TileParticleGenerator; +import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.client.render.CustomParticle; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; public class ParticleGenerator extends Block { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetector.java index 7db791fb..b348874c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetector.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,10 +9,10 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; -import draconicevolution.common.tileentities.TilePlayerDetector; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetector; public class PlayerDetector extends TolkienBlock { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetectorAdvanced.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetectorAdvanced.java index 8af24d9d..f5c2f97e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetectorAdvanced.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlayerDetectorAdvanced.java @@ -1,12 +1,12 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.common.registry.GameRegistry; -import draconicevolution.client.interfaces.GuiHandler; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; -import draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; +import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; 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 ef498f66..99eb7905 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/Potentiometer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/Potentiometer.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import static net.minecraftforge.common.util.ForgeDirection.DOWN; import static net.minecraftforge.common.util.ForgeDirection.EAST; @@ -19,10 +19,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; -import draconicevolution.common.tileentities.TilePotentiometer; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.TilePotentiometer; public class Potentiometer extends TolkienBlock { 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 8b48eecf..53559ec3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/RainSensor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/RainSensor.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import java.util.Random; @@ -10,9 +10,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class RainSensor extends TolkienBlock { 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 22feb7a8..8b0550fe 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TestBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TestBlock.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import java.util.Random; @@ -8,9 +8,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.handler.ParticleHandler; -import draconicevolution.common.core.network.ExamplePacket; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; +import com.brandon3055.draconicevolution.common.core.network.ExamplePacket; public class TestBlock extends TolkienBlock { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TolkienBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TolkienBlock.java index 1e4a7691..2412c3d0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TolkienBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TolkienBlock.java @@ -1,11 +1,11 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.References; public class TolkienBlock extends Block { 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 baee6ab0..20469501 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/XRayBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/XRayBlock.java @@ -1,4 +1,4 @@ -package draconicevolution.common.blocks; +package com.brandon3055.draconicevolution.common.blocks; import java.util.Random; @@ -13,10 +13,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.handler.ParticleHandler; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.Strings; +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.lib.Strings; public class XRayBlock extends TolkienBlock { 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 ef9578f6..aac95793 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java @@ -1,7 +1,7 @@ -package draconicevolution.common.container; +package com.brandon3055.draconicevolution.common.container; -import draconicevolution.client.interfaces.SlotItemValid; -import draconicevolution.common.tileentities.TileGrinder; +import com.brandon3055.draconicevolution.client.interfaces.SlotItemValid; +import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java index bbbf5005..f3cbeeff 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerPlayerDetector.java @@ -1,8 +1,8 @@ -package draconicevolution.common.container; +package com.brandon3055.draconicevolution.common.container; import java.util.Iterator; -import draconicevolution.common.tileentities.TileGrinder; +import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -10,10 +10,10 @@ import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import draconicevolution.client.interfaces.GUIPlayerDetector; -import draconicevolution.client.interfaces.SlotItemValid; -import draconicevolution.client.interfaces.SlotOpaqueBlock; -import draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; +import com.brandon3055.draconicevolution.client.interfaces.GUIPlayerDetector; +import com.brandon3055.draconicevolution.client.interfaces.SlotItemValid; +import com.brandon3055.draconicevolution.client.interfaces.SlotOpaqueBlock; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; public class ContainerPlayerDetector extends Container { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReader.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReader.java index c60288c2..0fa24429 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReader.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerReader.java @@ -1,4 +1,4 @@ -package draconicevolution.common.container; +package com.brandon3055.draconicevolution.common.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -6,8 +6,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import draconicevolution.common.core.utills.InventoryReader; -import draconicevolution.common.items.tools.Reader; +import com.brandon3055.draconicevolution.common.core.utills.InventoryReader; +import com.brandon3055.draconicevolution.common.items.tools.Reader; public class ContainerReader extends Container { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerSunDial.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerSunDial.java index 4e7f6f6e..9be5bdec 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerSunDial.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerSunDial.java @@ -1,6 +1,6 @@ -package draconicevolution.common.container; +package com.brandon3055.draconicevolution.common.container; -import draconicevolution.common.tileentities.TileSunDial; +import com.brandon3055.draconicevolution.common.tileentities.TileSunDial; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerWeatherController.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerWeatherController.java index ffa9a823..eda6cd08 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerWeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerWeatherController.java @@ -1,7 +1,7 @@ -package draconicevolution.common.container; +package com.brandon3055.draconicevolution.common.container; -import draconicevolution.client.interfaces.SlotItemValid; -import draconicevolution.common.tileentities.TileWeatherController; +import com.brandon3055.draconicevolution.client.interfaces.SlotItemValid; +import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java index 726e1476..05e183ff 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.core.handler; 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/core/handler/CraftingHandler.java index 86195104..e58e23f4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java @@ -1,20 +1,20 @@ -package draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.core.handler; -import draconicevolution.common.blocks.ModBlocks; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.items.tools.DraconicAxe; -import draconicevolution.common.items.tools.DraconicDistructionStaff; -import draconicevolution.common.items.tools.DraconicHoe; -import draconicevolution.common.items.tools.DraconicPickaxe; -import draconicevolution.common.items.tools.DraconicShovel; -import draconicevolution.common.items.tools.TeleporterMKI; -import draconicevolution.common.items.tools.TeleporterMKII; -import draconicevolution.common.items.tools.WyvernPickaxe; -import draconicevolution.common.items.tools.WyvernShovel; -import draconicevolution.common.items.weapons.DraconicBow; -import draconicevolution.common.items.weapons.DraconicSword; -import draconicevolution.common.items.weapons.WyvernBow; -import draconicevolution.common.items.weapons.WyvernSword; +import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.items.tools.DraconicAxe; +import com.brandon3055.draconicevolution.common.items.tools.DraconicDistructionStaff; +import com.brandon3055.draconicevolution.common.items.tools.DraconicHoe; +import com.brandon3055.draconicevolution.common.items.tools.DraconicPickaxe; +import com.brandon3055.draconicevolution.common.items.tools.DraconicShovel; +import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKI; +import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKII; +import com.brandon3055.draconicevolution.common.items.tools.WyvernPickaxe; +import com.brandon3055.draconicevolution.common.items.tools.WyvernShovel; +import com.brandon3055.draconicevolution.common.items.weapons.DraconicBow; +import com.brandon3055.draconicevolution.common.items.weapons.DraconicSword; +import com.brandon3055.draconicevolution.common.items.weapons.WyvernBow; +import com.brandon3055.draconicevolution.common.items.weapons.WyvernSword; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/FMLEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/FMLEventHandler.java index d858148b..7f577eb7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/FMLEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/FMLEventHandler.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.core.handler; public class FMLEventHandler { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ModEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ModEventHandler.java index 4e8161d1..1065cbfc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ModEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ModEventHandler.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.core.handler; public class ModEventHandler { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ParticleHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ParticleHandler.java index 48390ba3..8eb3041d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ParticleHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ParticleHandler.java @@ -1,9 +1,9 @@ -package draconicevolution.common.core.handler; +package com.brandon3055.draconicevolution.common.core.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.world.World; -import draconicevolution.client.render.DistortionParticle; +import com.brandon3055.draconicevolution.client.render.DistortionParticle; public class ParticleHandler { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/helper/ItemNBTHelper.java b/src/main/java/com/brandon3055/draconicevolution/common/core/helper/ItemNBTHelper.java index 8384c741..cbaba0ae 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/helper/ItemNBTHelper.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.helper; +package com.brandon3055.draconicevolution.common.core.helper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ButtonPacket.java index 14372e80..4ed8e05d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ButtonPacket.java @@ -1,7 +1,7 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; -import draconicevolution.common.container.ContainerWeatherController; -import draconicevolution.common.tileentities.TileWeatherController; +import com.brandon3055.draconicevolution.common.container.ContainerWeatherController; +import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ChannelHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ChannelHandler.java index 72ff5839..a6ba4273 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ChannelHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ChannelHandler.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ExamplePacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ExamplePacket.java index 2f2d26a3..a5281706 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ExamplePacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ExamplePacket.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/IPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/IPacket.java index 63b35328..6004b865 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/IPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/IPacket.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ParticleGenPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ParticleGenPacket.java index 25029803..7d98af08 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/ParticleGenPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/ParticleGenPacket.java @@ -1,10 +1,10 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.tileentity.TileEntity; -import draconicevolution.common.tileentities.TileParticleGenerator; +import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; public class ParticleGenPacket implements IPacket { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorButtonPacket.java index a97afcd4..a89a15f9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorButtonPacket.java @@ -1,11 +1,11 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.network.NetHandlerPlayServer; import cpw.mods.fml.common.network.ByteBufUtils; -import draconicevolution.common.container.ContainerPlayerDetector; -import draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; +import com.brandon3055.draconicevolution.common.container.ContainerPlayerDetector; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; public class PlayerDetectorButtonPacket implements IPacket diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorStringPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorStringPacket.java index 68a45087..12106f25 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorStringPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/PlayerDetectorStringPacket.java @@ -1,11 +1,11 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.network.NetHandlerPlayServer; import cpw.mods.fml.common.network.ByteBufUtils; -import draconicevolution.common.container.ContainerPlayerDetector; -import draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; +import com.brandon3055.draconicevolution.common.container.ContainerPlayerDetector; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; public class PlayerDetectorStringPacket implements IPacket diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterPacket.java index f864a08a..1960fe6b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterPacket.java @@ -1,8 +1,8 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; -import draconicevolution.common.core.handler.ConfigHandler; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.core.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.init.Items; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterStringPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterStringPacket.java index eb7beb44..305cd71f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterStringPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/network/TeleporterStringPacket.java @@ -1,12 +1,12 @@ -package draconicevolution.common.core.network; +package com.brandon3055.draconicevolution.common.core.network; import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; import cpw.mods.fml.common.network.ByteBufUtils; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; public class TeleporterStringPacket implements IPacket { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/ClientProxy.java index ccda5482..65c65f9a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/ClientProxy.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.proxy; +package com.brandon3055.draconicevolution.common.core.proxy; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.Item; @@ -7,13 +7,13 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import draconicevolution.client.render.BowRenderer; -import draconicevolution.client.render.ItemParticleGenRenderer; -import draconicevolution.client.render.ParticleGenRenderer; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.blocks.ModBlocks; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.tileentities.TileParticleGenerator; +import com.brandon3055.draconicevolution.client.render.BowRenderer; +import com.brandon3055.draconicevolution.client.render.ItemParticleGenRenderer; +import com.brandon3055.draconicevolution.client.render.ParticleGenRenderer; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; public class ClientProxy extends CommonProxy { private final static boolean debug = DraconicEvolution.debug; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/CommonProxy.java index 411d231a..28ee78d5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/proxy/CommonProxy.java @@ -1,28 +1,28 @@ -package draconicevolution.common.core.proxy; +package com.brandon3055.draconicevolution.common.core.proxy; -import draconicevolution.common.core.network.*; -import draconicevolution.common.world.DraconicWorldGenerator; +import com.brandon3055.draconicevolution.common.core.network.*; +import com.brandon3055.draconicevolution.common.world.DraconicWorldGenerator; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; -import draconicevolution.client.interfaces.GuiHandler; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.blocks.ModBlocks; -import draconicevolution.common.core.handler.ConfigHandler; -import draconicevolution.common.core.handler.CraftingHandler; -import draconicevolution.common.core.handler.FMLEventHandler; -import draconicevolution.common.core.handler.ModEventHandler; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.tileentities.TileGrinder; -import draconicevolution.common.tileentities.TileParticleGenerator; -import draconicevolution.common.tileentities.TilePlayerDetector; -import draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; -import draconicevolution.common.tileentities.TilePotentiometer; -import draconicevolution.common.tileentities.TileSunDial; -import draconicevolution.common.tileentities.TileWeatherController; +import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +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.ModEventHandler; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; +import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetector; +import com.brandon3055.draconicevolution.common.tileentities.TilePlayerDetectorAdvanced; +import com.brandon3055.draconicevolution.common.tileentities.TilePotentiometer; +import com.brandon3055.draconicevolution.common.tileentities.TileSunDial; +import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; public class CommonProxy { private final static boolean debug = DraconicEvolution.debug; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/CustomTeleporter.java b/src/main/java/com/brandon3055/draconicevolution/common/core/utills/CustomTeleporter.java index 4d4e32a1..2e7a301a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/CustomTeleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/utills/CustomTeleporter.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.core.utills; import net.minecraft.entity.Entity; import net.minecraft.world.Teleporter; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InventoryReader.java b/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InventoryReader.java index 1a87f364..9d196306 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InventoryReader.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/utills/InventoryReader.java @@ -1,6 +1,6 @@ -package draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.core.utills; -import draconicevolution.common.items.tools.Reader; +import com.brandon3055.draconicevolution.common.items.tools.Reader; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/Teleporter.java b/src/main/java/com/brandon3055/draconicevolution/common/core/utills/Teleporter.java index a823a358..dec9afab 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/utills/Teleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/utills/Teleporter.java @@ -1,4 +1,4 @@ -package draconicevolution.common.core.utills; +package com.brandon3055.draconicevolution.common.core.utills; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; 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 7f251a66..1ff61e51 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java @@ -1,4 +1,4 @@ -package draconicevolution.common.entity; +package com.brandon3055.draconicevolution.common.entity; import java.util.List; 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 2b4c372f..ccc516e8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCompound.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCompound.java @@ -1,9 +1,9 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; import java.util.List; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +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 3c9b395f..8d601496 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconicCore.java @@ -1,7 +1,7 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconicCore extends TolkienItem { public DraconicCore() { 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 bff4b63d..a04c76c3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumBlend.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumBlend.java @@ -1,7 +1,7 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconiumBlend extends TolkienItem { public DraconiumBlend() { 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 7acd1960..ad8c7b99 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumDust.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumDust.java @@ -1,7 +1,7 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconiumDust extends TolkienItem { public DraconiumDust() { 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 265cd64d..472ecc90 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumIngot.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DraconiumIngot.java @@ -1,7 +1,7 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconiumIngot extends TolkienItem { public DraconiumIngot() { 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 5f8fec86..5c1b6f0d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/DragonHeart.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/DragonHeart.java @@ -1,7 +1,7 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DragonHeart extends TolkienItem { public DragonHeart() { 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 d41c1088..cc5bb30a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/InfusedCompound.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/InfusedCompound.java @@ -1,7 +1,7 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.Strings; public class InfusedCompound extends TolkienItem { public InfusedCompound() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/ModItems.java b/src/main/java/com/brandon3055/draconicevolution/common/items/ModItems.java index dc7f3f06..2d29c81c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/ModItems.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/ModItems.java @@ -1,23 +1,23 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; -import draconicevolution.common.items.tools.DraconicAxe; -import draconicevolution.common.items.tools.DraconicDistructionStaff; -import draconicevolution.common.items.tools.DraconicHoe; -import draconicevolution.common.items.tools.DraconicPickaxe; -import draconicevolution.common.items.tools.DraconicShovel; -import draconicevolution.common.items.tools.TeleporterMKI; -import draconicevolution.common.items.tools.TeleporterMKII; -import draconicevolution.common.items.tools.WyvernPickaxe; -import draconicevolution.common.items.tools.WyvernShovel; -import draconicevolution.common.items.weapons.DraconicBow; -import draconicevolution.common.items.weapons.DraconicSword; -import draconicevolution.common.items.weapons.WyvernBow; -import draconicevolution.common.items.weapons.WyvernSword; +import com.brandon3055.draconicevolution.common.items.tools.DraconicAxe; +import com.brandon3055.draconicevolution.common.items.tools.DraconicDistructionStaff; +import com.brandon3055.draconicevolution.common.items.tools.DraconicHoe; +import com.brandon3055.draconicevolution.common.items.tools.DraconicPickaxe; +import com.brandon3055.draconicevolution.common.items.tools.DraconicShovel; +import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKI; +import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKII; +import com.brandon3055.draconicevolution.common.items.tools.WyvernPickaxe; +import com.brandon3055.draconicevolution.common.items.tools.WyvernShovel; +import com.brandon3055.draconicevolution.common.items.weapons.DraconicBow; +import com.brandon3055.draconicevolution.common.items.weapons.DraconicSword; +import com.brandon3055.draconicevolution.common.items.weapons.WyvernBow; +import com.brandon3055.draconicevolution.common.items.weapons.WyvernSword; public class ModItems { public static ArmorMaterial DRACONIUMARMOR_T1 = EnumHelper.addArmorMaterial("DRACONIUMARMOR_T1", -1, new int[] { 3, 8, 6, 3 }, 30); 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 4d350616..fbfb17ae 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java @@ -1,7 +1,7 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.Strings; public class SunFocus extends TolkienItem { public SunFocus() { 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 92d8d42a..7ddd1e0b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java @@ -1,8 +1,8 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; import java.util.List; -import draconicevolution.common.items.tools.ToolHandler; +import com.brandon3055.draconicevolution.common.items.tools.ToolHandler; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -12,7 +12,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.lib.Strings; public class Tclogo extends TolkienItem { public Tclogo() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/TolkienItem.java b/src/main/java/com/brandon3055/draconicevolution/common/items/TolkienItem.java index 1b695c72..97894a20 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/TolkienItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/TolkienItem.java @@ -1,12 +1,12 @@ -package draconicevolution.common.items; +package com.brandon3055.draconicevolution.common.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.References; public class TolkienItem extends Item { public String getUnwrappedUnlocalizedName(final String unlocalizedName) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernChestPlate.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernChestPlate.java index b5ef73fb..e2c0e296 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernChestPlate.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernChestPlate.java @@ -1,4 +1,4 @@ -package draconicevolution.common.items.armor; +package com.brandon3055.draconicevolution.common.items.armor; import java.util.List; @@ -16,10 +16,10 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class WyvernChestPlate extends ItemArmor { public IIcon itemIcon1; 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 f0a7c18b..af66e43f 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; @@ -17,10 +17,10 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; import org.lwjgl.input.Keyboard; public class DraconicAxe extends ItemAxe { 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 8449b717..f90b7bbe 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; import java.util.Set; @@ -29,11 +29,11 @@ import com.google.common.collect.Sets; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconicDistructionStaff extends ItemTool { public IIcon itemIcon0; 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 87cee680..27fd2d26 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 @@ -1,8 +1,9 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -21,13 +22,12 @@ import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; -public class DraconicHoe extends ItemHoe -{ +public class DraconicHoe extends ItemHoe { public DraconicHoe() { super(ModItems.DRACONIUM_T1); this.setUnlocalizedName(Strings.draconicHoeName); @@ -37,118 +37,95 @@ public class DraconicHoe extends ItemHoe @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) - { + public void registerIcons(final IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "draconic_hoe"); } - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) - { - boolean successfull = false; + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) { + boolean successfull = false; Block clicked = world.getBlock(x, y, z); - if(!player.isSneaking() && player.canPlayerEdit(x, y, z, par7, stack) && (clicked == Blocks.dirt || clicked == Blocks.grass || clicked == Blocks.farmland) && par7 == 1) - { - int size = 4; - for (int x1 = -size; x1 <= size; x1++) - { - for (int z1 = -size; z1 <= size; z1++) - { - Block topBlock = world.getBlock(x + x1, y + 1, z + z1); - if (topBlock.isReplaceable(world, x + x1, y + 1, z + z1)) - { - world.setBlockToAir(x + x1, y + 1, z + z1); - } - Block topBlock2 = world.getBlock(x + x1, y + 2, z + z1); - if (topBlock2.isReplaceable(world, x + x1, y + 2, z + z1)) - { - world.setBlockToAir(x + x1, y + 2, z + z1); - } - Block block = world.getBlock(x + x1, y, z + z1); - if (block.isReplaceable(world, x + x1, y, z + z1)) - { - world.setBlockToAir(x + x1, y, z + z1); - } - - if (world.getBlock(x + x1, y, z + z1) == Blocks.air){ - if(player.inventory.hasItem(Item.getItemFromBlock(Blocks.dirt)) || player.capabilities.isCreativeMode) - { - world.setBlock(x + x1, y, z + z1, Blocks.dirt); - player.inventory.consumeInventoryItem(Item.getItemFromBlock(Blocks.dirt)); + if (!player.isSneaking() && player.canPlayerEdit(x, y, z, par7, stack) && (clicked == Blocks.dirt || clicked == Blocks.grass || clicked == Blocks.farmland) && par7 == 1) { + int size = 4; + for (int x1 = -size; x1 <= size; x1++) { + for (int z1 = -size; z1 <= size; z1++) { + Block topBlock = world.getBlock(x + x1, y + 1, z + z1); + if (topBlock.isReplaceable(world, x + x1, y + 1, z + z1)) { + world.setBlockToAir(x + x1, y + 1, z + z1); + } + Block topBlock2 = world.getBlock(x + x1, y + 2, z + z1); + if (topBlock2.isReplaceable(world, x + x1, y + 2, z + z1)) { + world.setBlockToAir(x + x1, y + 2, z + z1); + } + Block block = world.getBlock(x + x1, y, z + z1); + if (block.isReplaceable(world, x + x1, y, z + z1) && !block.getMaterial().equals(Material.water)) { + world.setBlockToAir(x + x1, y, z + z1); } - } - - if ((world.getBlock(x + x1, y + 1, z + z1) == Blocks.dirt || world.getBlock(x + x1, y + 1, z + z1) == Blocks.grass || world.getBlock(x + x1, y + 1, z + z1) == Blocks.farmland) && world.getBlock(x + x1, y + 2, z + z1) == Blocks.air) - { - if (!world.isRemote) - world.spawnEntityInWorld(new EntityItem(world, player.posX, player.posY, player.posZ, new ItemStack(Item.getItemFromBlock(Blocks.dirt)))); - world.setBlock(x + x1, y + 1, z + z1, Blocks.air); - } - if(hoe(stack, player, world, x + x1, y, z + z1, par7)) - successfull = true; + if (world.getBlock(x + x1, y, z + z1) == Blocks.air && world.getBlock(x + x1, y - 1, z + z1).isBlockSolid(world, x, y, z, 1)) { + if (player.inventory.hasItem(Item.getItemFromBlock(Blocks.dirt)) || player.capabilities.isCreativeMode) { + world.setBlock(x + x1, y, z + z1, Blocks.dirt); + player.inventory.consumeInventoryItem(Item.getItemFromBlock(Blocks.dirt)); + } + } + + if ((world.getBlock(x + x1, y + 1, z + z1) == Blocks.dirt || world.getBlock(x + x1, y + 1, z + z1) == Blocks.grass || world.getBlock(x + x1, y + 1, z + z1) == Blocks.farmland) && world.getBlock(x + x1, y + 2, z + z1) == Blocks.air) { + if (!world.isRemote) + world.spawnEntityInWorld(new EntityItem(world, player.posX, player.posY, player.posZ, new ItemStack(Item.getItemFromBlock(Blocks.dirt)))); + world.setBlock(x + x1, y + 1, z + z1, Blocks.air); + } + + if (hoe(stack, player, world, x + x1, y, z + z1, par7)) successfull = true; + } } - } - } - else - successfull = hoe(stack, player, world, x, y, z, par7); - Block block1 = Blocks.farmland; - if(successfull) - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); + } else successfull = hoe(stack, player, world, x, y, z, par7); + Block block1 = Blocks.farmland; + if (successfull) + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); return successfull; } - - private boolean hoe(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7){ - if (!player.canPlayerEdit(x, y, z, par7, stack)) - { + + private boolean hoe(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7) { + if (!player.canPlayerEdit(x, y, z, par7, stack)) { return false; - } else - { + } else { UseHoeEvent event = new UseHoeEvent(player, stack, world, x, y, z); - if (MinecraftForge.EVENT_BUS.post(event)) - { + if (MinecraftForge.EVENT_BUS.post(event)) { return false; } - if (event.getResult() == Result.ALLOW) - { + if (event.getResult() == Result.ALLOW) { stack.damageItem(1, player); return true; } Block block = world.getBlock(x, y, z); - if (par7 != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) - { + if (par7 != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; - if (world.isRemote) - { + if (world.isRemote) { return true; - } else - { + } else { world.setBlock(x, y, z, block1); stack.damageItem(1, player); return true; } - } else - { + } else { return false; } } } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) - { - + public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { + list.add(EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("info.draconicLaw1.txt")); list.add(EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("info.draconicLaw2.txt")); } - - public static void registerRecipe() - { + + public static void registerRecipe() { CraftingManager.getInstance().addRecipe(new ItemStack(ModItems.draconicHoe), "ISI", "DHD", "ITI", 'H', Items.diamond_hoe, 'T', ModItems.draconicCore, 'S', ModItems.sunFocus, 'D', ModItems.draconiumIngot, 'I', Items.diamond); } } 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 a16b42b7..07d462fd 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; @@ -21,11 +21,11 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconicPickaxe extends ItemPickaxe { public IIcon itemIcon0; 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 88269fb3..879201ba 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; @@ -21,11 +21,11 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconicShovel extends ItemSpade { public IIcon itemIcon0; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Reader.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Reader.java index 87ac09b9..6e2bb342 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Reader.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Reader.java @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -12,9 +12,9 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class Reader extends Item { 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 5c0c9e4f..9ab1fd70 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,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; @@ -20,12 +20,12 @@ import net.minecraft.world.WorldProvider; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.core.utills.Teleporter; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.core.utills.Teleporter; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class TeleporterMKI extends Item { 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 eddb08d9..9db6d3a0 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; @@ -19,13 +19,13 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.client.interfaces.GuiHandler; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.core.utills.Teleporter; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.core.utills.Teleporter; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class TeleporterMKII extends Item { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TestPick.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TestPick.java index 4f68c303..3ec02e6d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TestPick.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TestPick.java @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.ArrayList; import java.util.List; 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 0c87ec2d..4eb77461 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,11 +1,11 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.ArrayList; import java.util.List; import java.util.Map; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; @@ -144,9 +144,8 @@ public class ToolHandler { } public static void demageEntytyBasedOnHealth(Entity entity, EntityPlayer player, float dmg) { - System.out.println(dmg); World world = player.worldObj; - if (entity instanceof EntityLivingBase) {//entity.getEyeHeight() > 0) { + if (entity instanceof EntityLivingBase) { float entHealth = ((EntityLivingBase) entity).getHealth(); if (!world.isRemote) { if (entHealth > 20) { @@ -155,12 +154,10 @@ public class ToolHandler { } } else if (entity instanceof EntityDragonPart) { if (!world.isRemote) { - System.out.println("part"); entity.attackEntityFrom(DamageSource.causePlayerDamage(player), 200F * dmg); } } else { if (!world.isRemote) { - System.out.println("Oter"); entity.attackEntityFrom(DamageSource.causePlayerDamage(player), 100F * dmg); } } 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 9aa503d2..6e077e05 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; @@ -21,11 +21,11 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class WyvernPickaxe extends ItemPickaxe { public IIcon itemIcon0; 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 9f84229f..47245edc 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.tools; +package com.brandon3055.draconicevolution.common.items.tools; import java.util.List; @@ -21,11 +21,11 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class WyvernShovel extends ItemSpade { public IIcon itemIcon0; 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 2ce613e1..304edb88 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 @@ -1,8 +1,8 @@ -package draconicevolution.common.items.weapons; +package com.brandon3055.draconicevolution.common.items.weapons; import java.util.Random; -import draconicevolution.common.entity.EntityDraconicArrow; +import com.brandon3055.draconicevolution.common.entity.EntityDraconicArrow; 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 2b8e6b88..28d30c8a 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,4 +1,4 @@ -package draconicevolution.common.items.weapons; +package com.brandon3055.draconicevolution.common.items.weapons; import java.util.List; @@ -22,11 +22,11 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconicBow extends ItemBow { 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 1d4b0035..a8b6bfc2 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.weapons; +package com.brandon3055.draconicevolution.common.items.weapons; import java.util.List; @@ -13,11 +13,11 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.items.tools.ToolHandler; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.items.tools.ToolHandler; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class DraconicSword extends ItemSword { public DraconicSword() { 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 5ba3772d..e713c4c1 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,4 +1,4 @@ -package draconicevolution.common.items.weapons; +package com.brandon3055.draconicevolution.common.items.weapons; import java.util.List; @@ -22,11 +22,11 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.core.helper.ItemNBTHelper; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.core.helper.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class WyvernBow extends ItemBow { public static final String[] bowPullIconNameArray = new String[] { "pulling_0", "pulling_1", "pulling_2" }; 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 e64cae9b..b3d19800 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 @@ -1,4 +1,4 @@ -package draconicevolution.common.items.weapons; +package com.brandon3055.draconicevolution.common.items.weapons; import java.util.List; @@ -15,11 +15,11 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import draconicevolution.DraconicEvolution; -import draconicevolution.common.items.ModItems; -import draconicevolution.common.items.tools.ToolHandler; -import draconicevolution.common.lib.References; -import draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.items.ModItems; +import com.brandon3055.draconicevolution.common.items.tools.ToolHandler; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.lib.Strings; public class WyvernSword extends ItemSword { public WyvernSword() { 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 2e2a3c28..955c78e8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java @@ -1,10 +1,10 @@ -package draconicevolution.common.lib; +package com.brandon3055.draconicevolution.common.lib; public class References { public static final String MODID = "DraconicEvolution"; public static final String MODNAME = "Draconic Evolution"; - public static final String VERSION = "0.9.1-Beta-Pre1"; - public static final String CLIENTPROXYLOCATION = "draconicevolution.common.core.proxy.ClientProxy"; - public static final String COMMONPROXYLOCATION = "draconicevolution.common.core.proxy.CommonProxy"; + public static final String VERSION = "0.9.1-Beta"; + 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 RESOURCESPREFIX = MODID + ":"; } \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/Strings.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/Strings.java index c9c121fe..ab1f8174 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/Strings.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/Strings.java @@ -1,4 +1,4 @@ -package draconicevolution.common.lib; +package com.brandon3055.draconicevolution.common.lib; public class Strings {// public static Block name public static final String blockWeatherControllerName = "weatherController"; 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 70046704..2986c5ca 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileGrinder.java @@ -1,4 +1,4 @@ -package draconicevolution.common.tileentities; +package com.brandon3055.draconicevolution.common.tileentities; import java.util.List; 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 71de21e2..adac4ad0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java @@ -1,4 +1,4 @@ -package draconicevolution.common.tileentities; +package com.brandon3055.draconicevolution.common.tileentities; import java.util.Random; @@ -9,8 +9,8 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import draconicevolution.client.render.CustomParticle; -import draconicevolution.common.core.handler.ParticleHandler; +import com.brandon3055.draconicevolution.client.render.CustomParticle; +import com.brandon3055.draconicevolution.common.core.handler.ParticleHandler; public class TileParticleGenerator extends TileEntity { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetector.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetector.java index 6a9dd3fb..8f4a1495 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetector.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetector.java @@ -1,4 +1,4 @@ -package draconicevolution.common.tileentities; +package com.brandon3055.draconicevolution.common.tileentities; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java index 751087db..d7a4e50c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePlayerDetectorAdvanced.java @@ -1,4 +1,4 @@ -package draconicevolution.common.tileentities; +package com.brandon3055.draconicevolution.common.tileentities; import java.util.Iterator; import java.util.List; @@ -20,7 +20,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import draconicevolution.common.container.ContainerPlayerDetector; +import com.brandon3055.draconicevolution.common.container.ContainerPlayerDetector; public class TilePlayerDetectorAdvanced extends TileEntity implements IInventory { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePotentiometer.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePotentiometer.java index 67a1902c..4421a531 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePotentiometer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TilePotentiometer.java @@ -1,4 +1,4 @@ -package draconicevolution.common.tileentities; +package com.brandon3055.draconicevolution.common.tileentities; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileSunDial.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileSunDial.java index 51d65518..2892ed05 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileSunDial.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileSunDial.java @@ -1,4 +1,4 @@ -package draconicevolution.common.tileentities; +package com.brandon3055.draconicevolution.common.tileentities; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileWeatherController.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileWeatherController.java index 7f08ea5d..6549a306 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileWeatherController.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileWeatherController.java @@ -1,4 +1,4 @@ -package draconicevolution.common.tileentities; +package com.brandon3055.draconicevolution.common.tileentities; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -10,7 +10,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.storage.WorldInfo; -import draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.DraconicEvolution; public class TileWeatherController extends TileEntity implements IInventory { 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 82966c8f..b4cbcb04 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java @@ -1,4 +1,4 @@ -package draconicevolution.common.world; +package com.brandon3055.draconicevolution.common.world; import java.util.Random; @@ -8,7 +8,7 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; import cpw.mods.fml.common.IWorldGenerator; -import draconicevolution.common.blocks.ModBlocks; +import com.brandon3055.draconicevolution.common.blocks.ModBlocks; public class DraconicWorldGenerator implements IWorldGenerator { @Override