diff --git a/.gitattributes b/.gitattributes index 38d313246..758843d9b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,14 @@ * text eol=lf *.bat text eol=crlf -*.patch text +*.patch text eol=lf +*.java text eol=lf +*.gradle text eol=crlf *.png binary *.exe binary *.dll binary -*.zip binary \ No newline at end of file +*.jar binary +*.lzma binary +*.zip binary +*.pyd binary +*.cfg text eol=lf +*.py text eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore index b2054a98e..788849df8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,16 @@ -*.DS_Store -/logs/ -/*.pyc -/forge-*/ -/patches-old/ -/mcp/ +#eclipse +/bin +/.settings +/.classpath + +#idea +/.idea +*.iml + +#gradle +/build +/.gradle + +#occupational hazards /eclipse/ -/target/ -/temp/ +/repo/ diff --git a/client/ibxm/Channel.java b/src/main/java/ibxm/Channel.java similarity index 100% rename from client/ibxm/Channel.java rename to src/main/java/ibxm/Channel.java diff --git a/client/ibxm/Envelope.java b/src/main/java/ibxm/Envelope.java similarity index 100% rename from client/ibxm/Envelope.java rename to src/main/java/ibxm/Envelope.java diff --git a/client/ibxm/FastTracker2.java b/src/main/java/ibxm/FastTracker2.java similarity index 100% rename from client/ibxm/FastTracker2.java rename to src/main/java/ibxm/FastTracker2.java diff --git a/client/ibxm/IBXM.java b/src/main/java/ibxm/IBXM.java similarity index 100% rename from client/ibxm/IBXM.java rename to src/main/java/ibxm/IBXM.java diff --git a/client/ibxm/Instrument.java b/src/main/java/ibxm/Instrument.java similarity index 100% rename from client/ibxm/Instrument.java rename to src/main/java/ibxm/Instrument.java diff --git a/client/ibxm/LogTable.java b/src/main/java/ibxm/LogTable.java similarity index 100% rename from client/ibxm/LogTable.java rename to src/main/java/ibxm/LogTable.java diff --git a/client/ibxm/Module.java b/src/main/java/ibxm/Module.java similarity index 100% rename from client/ibxm/Module.java rename to src/main/java/ibxm/Module.java diff --git a/client/ibxm/Pattern.java b/src/main/java/ibxm/Pattern.java similarity index 100% rename from client/ibxm/Pattern.java rename to src/main/java/ibxm/Pattern.java diff --git a/client/ibxm/Player.java b/src/main/java/ibxm/Player.java similarity index 100% rename from client/ibxm/Player.java rename to src/main/java/ibxm/Player.java diff --git a/client/ibxm/ProTracker.java b/src/main/java/ibxm/ProTracker.java similarity index 100% rename from client/ibxm/ProTracker.java rename to src/main/java/ibxm/ProTracker.java diff --git a/client/ibxm/Sample.java b/src/main/java/ibxm/Sample.java similarity index 100% rename from client/ibxm/Sample.java rename to src/main/java/ibxm/Sample.java diff --git a/client/ibxm/ScreamTracker3.java b/src/main/java/ibxm/ScreamTracker3.java similarity index 100% rename from client/ibxm/ScreamTracker3.java rename to src/main/java/ibxm/ScreamTracker3.java diff --git a/common/net/minecraftforge/classloading/FMLForgePlugin.java b/src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java similarity index 100% rename from common/net/minecraftforge/classloading/FMLForgePlugin.java rename to src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java diff --git a/client/net/minecraftforge/client/ClientCommandHandler.java b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java similarity index 100% rename from client/net/minecraftforge/client/ClientCommandHandler.java rename to src/main/java/net/minecraftforge/client/ClientCommandHandler.java diff --git a/client/net/minecraftforge/client/EnumHelperClient.java b/src/main/java/net/minecraftforge/client/EnumHelperClient.java similarity index 100% rename from client/net/minecraftforge/client/EnumHelperClient.java rename to src/main/java/net/minecraftforge/client/EnumHelperClient.java diff --git a/client/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java similarity index 100% rename from client/net/minecraftforge/client/ForgeHooksClient.java rename to src/main/java/net/minecraftforge/client/ForgeHooksClient.java diff --git a/client/net/minecraftforge/client/GuiControlsScrollPanel.java b/src/main/java/net/minecraftforge/client/GuiControlsScrollPanel.java similarity index 100% rename from client/net/minecraftforge/client/GuiControlsScrollPanel.java rename to src/main/java/net/minecraftforge/client/GuiControlsScrollPanel.java diff --git a/client/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java similarity index 100% rename from client/net/minecraftforge/client/GuiIngameForge.java rename to src/main/java/net/minecraftforge/client/GuiIngameForge.java diff --git a/client/net/minecraftforge/client/IItemRenderer.java b/src/main/java/net/minecraftforge/client/IItemRenderer.java similarity index 100% rename from client/net/minecraftforge/client/IItemRenderer.java rename to src/main/java/net/minecraftforge/client/IItemRenderer.java diff --git a/client/net/minecraftforge/client/IRenderContextHandler.java b/src/main/java/net/minecraftforge/client/IRenderContextHandler.java similarity index 100% rename from client/net/minecraftforge/client/IRenderContextHandler.java rename to src/main/java/net/minecraftforge/client/IRenderContextHandler.java diff --git a/client/net/minecraftforge/client/IRenderHandler.java b/src/main/java/net/minecraftforge/client/IRenderHandler.java similarity index 100% rename from client/net/minecraftforge/client/IRenderHandler.java rename to src/main/java/net/minecraftforge/client/IRenderHandler.java diff --git a/client/net/minecraftforge/client/MinecraftForgeClient.java b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java similarity index 100% rename from client/net/minecraftforge/client/MinecraftForgeClient.java rename to src/main/java/net/minecraftforge/client/MinecraftForgeClient.java diff --git a/client/net/minecraftforge/client/event/ClientChatReceivedEvent.java b/src/main/java/net/minecraftforge/client/event/ClientChatReceivedEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/ClientChatReceivedEvent.java rename to src/main/java/net/minecraftforge/client/event/ClientChatReceivedEvent.java diff --git a/client/net/minecraftforge/client/event/DrawBlockHighlightEvent.java b/src/main/java/net/minecraftforge/client/event/DrawBlockHighlightEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/DrawBlockHighlightEvent.java rename to src/main/java/net/minecraftforge/client/event/DrawBlockHighlightEvent.java diff --git a/client/net/minecraftforge/client/event/FOVUpdateEvent.java b/src/main/java/net/minecraftforge/client/event/FOVUpdateEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/FOVUpdateEvent.java rename to src/main/java/net/minecraftforge/client/event/FOVUpdateEvent.java diff --git a/client/net/minecraftforge/client/event/GuiOpenEvent.java b/src/main/java/net/minecraftforge/client/event/GuiOpenEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/GuiOpenEvent.java rename to src/main/java/net/minecraftforge/client/event/GuiOpenEvent.java diff --git a/client/net/minecraftforge/client/event/MouseEvent.java b/src/main/java/net/minecraftforge/client/event/MouseEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/MouseEvent.java rename to src/main/java/net/minecraftforge/client/event/MouseEvent.java diff --git a/client/net/minecraftforge/client/event/RenderGameOverlayEvent.java b/src/main/java/net/minecraftforge/client/event/RenderGameOverlayEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/RenderGameOverlayEvent.java rename to src/main/java/net/minecraftforge/client/event/RenderGameOverlayEvent.java diff --git a/client/net/minecraftforge/client/event/RenderLivingEvent.java b/src/main/java/net/minecraftforge/client/event/RenderLivingEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/RenderLivingEvent.java rename to src/main/java/net/minecraftforge/client/event/RenderLivingEvent.java diff --git a/client/net/minecraftforge/client/event/RenderPlayerEvent.java b/src/main/java/net/minecraftforge/client/event/RenderPlayerEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/RenderPlayerEvent.java rename to src/main/java/net/minecraftforge/client/event/RenderPlayerEvent.java diff --git a/client/net/minecraftforge/client/event/RenderWorldLastEvent.java b/src/main/java/net/minecraftforge/client/event/RenderWorldLastEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/RenderWorldLastEvent.java rename to src/main/java/net/minecraftforge/client/event/RenderWorldLastEvent.java diff --git a/client/net/minecraftforge/client/event/TextureStitchEvent.java b/src/main/java/net/minecraftforge/client/event/TextureStitchEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/TextureStitchEvent.java rename to src/main/java/net/minecraftforge/client/event/TextureStitchEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/PlaySoundEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/PlaySoundEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlayStreamingEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlayStreamingEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/PlayStreamingEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/PlayStreamingEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java diff --git a/client/net/minecraftforge/client/event/sound/SoundEvent.java b/src/main/java/net/minecraftforge/client/event/sound/SoundEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/SoundEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/SoundEvent.java diff --git a/client/net/minecraftforge/client/event/sound/SoundLoadEvent.java b/src/main/java/net/minecraftforge/client/event/sound/SoundLoadEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/SoundLoadEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/SoundLoadEvent.java diff --git a/client/net/minecraftforge/client/event/sound/SoundResultEvent.java b/src/main/java/net/minecraftforge/client/event/sound/SoundResultEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/SoundResultEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/SoundResultEvent.java diff --git a/client/net/minecraftforge/client/event/sound/SoundSetupEvent.java b/src/main/java/net/minecraftforge/client/event/sound/SoundSetupEvent.java similarity index 100% rename from client/net/minecraftforge/client/event/sound/SoundSetupEvent.java rename to src/main/java/net/minecraftforge/client/event/sound/SoundSetupEvent.java diff --git a/client/net/minecraftforge/client/model/AdvancedModelLoader.java b/src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java similarity index 100% rename from client/net/minecraftforge/client/model/AdvancedModelLoader.java rename to src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java diff --git a/client/net/minecraftforge/client/model/IModelCustom.java b/src/main/java/net/minecraftforge/client/model/IModelCustom.java similarity index 100% rename from client/net/minecraftforge/client/model/IModelCustom.java rename to src/main/java/net/minecraftforge/client/model/IModelCustom.java diff --git a/client/net/minecraftforge/client/model/IModelCustomLoader.java b/src/main/java/net/minecraftforge/client/model/IModelCustomLoader.java similarity index 100% rename from client/net/minecraftforge/client/model/IModelCustomLoader.java rename to src/main/java/net/minecraftforge/client/model/IModelCustomLoader.java diff --git a/client/net/minecraftforge/client/model/ModelFormatException.java b/src/main/java/net/minecraftforge/client/model/ModelFormatException.java similarity index 100% rename from client/net/minecraftforge/client/model/ModelFormatException.java rename to src/main/java/net/minecraftforge/client/model/ModelFormatException.java diff --git a/client/net/minecraftforge/client/model/obj/Face.java b/src/main/java/net/minecraftforge/client/model/obj/Face.java similarity index 100% rename from client/net/minecraftforge/client/model/obj/Face.java rename to src/main/java/net/minecraftforge/client/model/obj/Face.java diff --git a/client/net/minecraftforge/client/model/obj/GroupObject.java b/src/main/java/net/minecraftforge/client/model/obj/GroupObject.java similarity index 100% rename from client/net/minecraftforge/client/model/obj/GroupObject.java rename to src/main/java/net/minecraftforge/client/model/obj/GroupObject.java diff --git a/client/net/minecraftforge/client/model/obj/ObjModelLoader.java b/src/main/java/net/minecraftforge/client/model/obj/ObjModelLoader.java similarity index 100% rename from client/net/minecraftforge/client/model/obj/ObjModelLoader.java rename to src/main/java/net/minecraftforge/client/model/obj/ObjModelLoader.java diff --git a/client/net/minecraftforge/client/model/obj/TextureCoordinate.java b/src/main/java/net/minecraftforge/client/model/obj/TextureCoordinate.java similarity index 100% rename from client/net/minecraftforge/client/model/obj/TextureCoordinate.java rename to src/main/java/net/minecraftforge/client/model/obj/TextureCoordinate.java diff --git a/client/net/minecraftforge/client/model/obj/Vertex.java b/src/main/java/net/minecraftforge/client/model/obj/Vertex.java similarity index 100% rename from client/net/minecraftforge/client/model/obj/Vertex.java rename to src/main/java/net/minecraftforge/client/model/obj/Vertex.java diff --git a/client/net/minecraftforge/client/model/obj/WavefrontObject.java b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java similarity index 100% rename from client/net/minecraftforge/client/model/obj/WavefrontObject.java rename to src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java diff --git a/client/net/minecraftforge/client/model/techne/TechneModel.java b/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java similarity index 100% rename from client/net/minecraftforge/client/model/techne/TechneModel.java rename to src/main/java/net/minecraftforge/client/model/techne/TechneModel.java diff --git a/client/net/minecraftforge/client/model/techne/TechneModelLoader.java b/src/main/java/net/minecraftforge/client/model/techne/TechneModelLoader.java similarity index 100% rename from client/net/minecraftforge/client/model/techne/TechneModelLoader.java rename to src/main/java/net/minecraftforge/client/model/techne/TechneModelLoader.java diff --git a/common/net/minecraftforge/common/AchievementPage.java b/src/main/java/net/minecraftforge/common/AchievementPage.java similarity index 100% rename from common/net/minecraftforge/common/AchievementPage.java rename to src/main/java/net/minecraftforge/common/AchievementPage.java diff --git a/common/net/minecraftforge/common/BiomeDictionary.java b/src/main/java/net/minecraftforge/common/BiomeDictionary.java similarity index 100% rename from common/net/minecraftforge/common/BiomeDictionary.java rename to src/main/java/net/minecraftforge/common/BiomeDictionary.java diff --git a/common/net/minecraftforge/common/BiomeManager.java b/src/main/java/net/minecraftforge/common/BiomeManager.java similarity index 100% rename from common/net/minecraftforge/common/BiomeManager.java rename to src/main/java/net/minecraftforge/common/BiomeManager.java diff --git a/common/net/minecraftforge/common/ChestGenHooks.java b/src/main/java/net/minecraftforge/common/ChestGenHooks.java similarity index 100% rename from common/net/minecraftforge/common/ChestGenHooks.java rename to src/main/java/net/minecraftforge/common/ChestGenHooks.java diff --git a/common/net/minecraftforge/common/ConfigCategory.java b/src/main/java/net/minecraftforge/common/ConfigCategory.java similarity index 100% rename from common/net/minecraftforge/common/ConfigCategory.java rename to src/main/java/net/minecraftforge/common/ConfigCategory.java diff --git a/common/net/minecraftforge/common/Configuration.java b/src/main/java/net/minecraftforge/common/Configuration.java similarity index 100% rename from common/net/minecraftforge/common/Configuration.java rename to src/main/java/net/minecraftforge/common/Configuration.java diff --git a/common/net/minecraftforge/common/DimensionManager.java b/src/main/java/net/minecraftforge/common/DimensionManager.java similarity index 100% rename from common/net/minecraftforge/common/DimensionManager.java rename to src/main/java/net/minecraftforge/common/DimensionManager.java diff --git a/common/net/minecraftforge/common/DungeonHooks.java b/src/main/java/net/minecraftforge/common/DungeonHooks.java similarity index 100% rename from common/net/minecraftforge/common/DungeonHooks.java rename to src/main/java/net/minecraftforge/common/DungeonHooks.java diff --git a/common/net/minecraftforge/common/EnumHelper.java b/src/main/java/net/minecraftforge/common/EnumHelper.java similarity index 100% rename from common/net/minecraftforge/common/EnumHelper.java rename to src/main/java/net/minecraftforge/common/EnumHelper.java diff --git a/common/net/minecraftforge/common/EnumPlantType.java b/src/main/java/net/minecraftforge/common/EnumPlantType.java similarity index 100% rename from common/net/minecraftforge/common/EnumPlantType.java rename to src/main/java/net/minecraftforge/common/EnumPlantType.java diff --git a/common/net/minecraftforge/common/FakePlayer.java b/src/main/java/net/minecraftforge/common/FakePlayer.java similarity index 100% rename from common/net/minecraftforge/common/FakePlayer.java rename to src/main/java/net/minecraftforge/common/FakePlayer.java diff --git a/common/net/minecraftforge/common/FakePlayerFactory.java b/src/main/java/net/minecraftforge/common/FakePlayerFactory.java similarity index 100% rename from common/net/minecraftforge/common/FakePlayerFactory.java rename to src/main/java/net/minecraftforge/common/FakePlayerFactory.java diff --git a/common/net/minecraftforge/common/ForgeChunkManager.java b/src/main/java/net/minecraftforge/common/ForgeChunkManager.java similarity index 100% rename from common/net/minecraftforge/common/ForgeChunkManager.java rename to src/main/java/net/minecraftforge/common/ForgeChunkManager.java diff --git a/common/net/minecraftforge/common/ForgeDirection.java b/src/main/java/net/minecraftforge/common/ForgeDirection.java similarity index 100% rename from common/net/minecraftforge/common/ForgeDirection.java rename to src/main/java/net/minecraftforge/common/ForgeDirection.java diff --git a/common/net/minecraftforge/common/ForgeDummyContainer.java b/src/main/java/net/minecraftforge/common/ForgeDummyContainer.java similarity index 100% rename from common/net/minecraftforge/common/ForgeDummyContainer.java rename to src/main/java/net/minecraftforge/common/ForgeDummyContainer.java diff --git a/common/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java similarity index 100% rename from common/net/minecraftforge/common/ForgeHooks.java rename to src/main/java/net/minecraftforge/common/ForgeHooks.java diff --git a/common/net/minecraftforge/common/ForgeInternalHandler.java b/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java similarity index 100% rename from common/net/minecraftforge/common/ForgeInternalHandler.java rename to src/main/java/net/minecraftforge/common/ForgeInternalHandler.java diff --git a/common/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java similarity index 100% rename from common/net/minecraftforge/common/ForgeVersion.java rename to src/main/java/net/minecraftforge/common/ForgeVersion.java diff --git a/common/net/minecraftforge/common/IExtendedEntityProperties.java b/src/main/java/net/minecraftforge/common/IExtendedEntityProperties.java similarity index 100% rename from common/net/minecraftforge/common/IExtendedEntityProperties.java rename to src/main/java/net/minecraftforge/common/IExtendedEntityProperties.java diff --git a/common/net/minecraftforge/common/IMinecartCollisionHandler.java b/src/main/java/net/minecraftforge/common/IMinecartCollisionHandler.java similarity index 100% rename from common/net/minecraftforge/common/IMinecartCollisionHandler.java rename to src/main/java/net/minecraftforge/common/IMinecartCollisionHandler.java diff --git a/common/net/minecraftforge/common/IPlantable.java b/src/main/java/net/minecraftforge/common/IPlantable.java similarity index 100% rename from common/net/minecraftforge/common/IPlantable.java rename to src/main/java/net/minecraftforge/common/IPlantable.java diff --git a/common/net/minecraftforge/common/IShearable.java b/src/main/java/net/minecraftforge/common/IShearable.java similarity index 100% rename from common/net/minecraftforge/common/IShearable.java rename to src/main/java/net/minecraftforge/common/IShearable.java diff --git a/common/net/minecraftforge/common/ISpecialArmor.java b/src/main/java/net/minecraftforge/common/ISpecialArmor.java similarity index 100% rename from common/net/minecraftforge/common/ISpecialArmor.java rename to src/main/java/net/minecraftforge/common/ISpecialArmor.java diff --git a/common/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java similarity index 100% rename from common/net/minecraftforge/common/MinecraftForge.java rename to src/main/java/net/minecraftforge/common/MinecraftForge.java diff --git a/common/net/minecraftforge/common/Property.java b/src/main/java/net/minecraftforge/common/Property.java similarity index 100% rename from common/net/minecraftforge/common/Property.java rename to src/main/java/net/minecraftforge/common/Property.java diff --git a/common/net/minecraftforge/common/RotationHelper.java b/src/main/java/net/minecraftforge/common/RotationHelper.java similarity index 100% rename from common/net/minecraftforge/common/RotationHelper.java rename to src/main/java/net/minecraftforge/common/RotationHelper.java diff --git a/common/net/minecraftforge/common/WorldSpecificSaveHandler.java b/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java similarity index 100% rename from common/net/minecraftforge/common/WorldSpecificSaveHandler.java rename to src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java diff --git a/common/net/minecraftforge/common/network/ForgeConnectionHandler.java b/src/main/java/net/minecraftforge/common/network/ForgeConnectionHandler.java similarity index 100% rename from common/net/minecraftforge/common/network/ForgeConnectionHandler.java rename to src/main/java/net/minecraftforge/common/network/ForgeConnectionHandler.java diff --git a/common/net/minecraftforge/common/network/ForgeNetworkHandler.java b/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java similarity index 100% rename from common/net/minecraftforge/common/network/ForgeNetworkHandler.java rename to src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java diff --git a/common/net/minecraftforge/common/network/ForgePacket.java b/src/main/java/net/minecraftforge/common/network/ForgePacket.java similarity index 100% rename from common/net/minecraftforge/common/network/ForgePacket.java rename to src/main/java/net/minecraftforge/common/network/ForgePacket.java diff --git a/common/net/minecraftforge/common/network/ForgePacketHandler.java b/src/main/java/net/minecraftforge/common/network/ForgePacketHandler.java similarity index 100% rename from common/net/minecraftforge/common/network/ForgePacketHandler.java rename to src/main/java/net/minecraftforge/common/network/ForgePacketHandler.java diff --git a/common/net/minecraftforge/common/network/ForgeTinyPacketHandler.java b/src/main/java/net/minecraftforge/common/network/ForgeTinyPacketHandler.java similarity index 100% rename from common/net/minecraftforge/common/network/ForgeTinyPacketHandler.java rename to src/main/java/net/minecraftforge/common/network/ForgeTinyPacketHandler.java diff --git a/common/net/minecraftforge/common/network/packet/DimensionRegisterPacket.java b/src/main/java/net/minecraftforge/common/network/packet/DimensionRegisterPacket.java similarity index 100% rename from common/net/minecraftforge/common/network/packet/DimensionRegisterPacket.java rename to src/main/java/net/minecraftforge/common/network/packet/DimensionRegisterPacket.java diff --git a/common/net/minecraftforge/event/ASMEventHandler.java b/src/main/java/net/minecraftforge/event/ASMEventHandler.java similarity index 100% rename from common/net/minecraftforge/event/ASMEventHandler.java rename to src/main/java/net/minecraftforge/event/ASMEventHandler.java diff --git a/common/net/minecraftforge/event/Cancelable.java b/src/main/java/net/minecraftforge/event/Cancelable.java similarity index 100% rename from common/net/minecraftforge/event/Cancelable.java rename to src/main/java/net/minecraftforge/event/Cancelable.java diff --git a/common/net/minecraftforge/event/CommandEvent.java b/src/main/java/net/minecraftforge/event/CommandEvent.java similarity index 100% rename from common/net/minecraftforge/event/CommandEvent.java rename to src/main/java/net/minecraftforge/event/CommandEvent.java diff --git a/common/net/minecraftforge/event/Event.java b/src/main/java/net/minecraftforge/event/Event.java similarity index 100% rename from common/net/minecraftforge/event/Event.java rename to src/main/java/net/minecraftforge/event/Event.java diff --git a/common/net/minecraftforge/event/EventBus.java b/src/main/java/net/minecraftforge/event/EventBus.java similarity index 100% rename from common/net/minecraftforge/event/EventBus.java rename to src/main/java/net/minecraftforge/event/EventBus.java diff --git a/common/net/minecraftforge/event/EventPriority.java b/src/main/java/net/minecraftforge/event/EventPriority.java similarity index 100% rename from common/net/minecraftforge/event/EventPriority.java rename to src/main/java/net/minecraftforge/event/EventPriority.java diff --git a/common/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java similarity index 100% rename from common/net/minecraftforge/event/ForgeEventFactory.java rename to src/main/java/net/minecraftforge/event/ForgeEventFactory.java diff --git a/common/net/minecraftforge/event/ForgeSubscribe.java b/src/main/java/net/minecraftforge/event/ForgeSubscribe.java similarity index 100% rename from common/net/minecraftforge/event/ForgeSubscribe.java rename to src/main/java/net/minecraftforge/event/ForgeSubscribe.java diff --git a/common/net/minecraftforge/event/IEventListener.java b/src/main/java/net/minecraftforge/event/IEventListener.java similarity index 100% rename from common/net/minecraftforge/event/IEventListener.java rename to src/main/java/net/minecraftforge/event/IEventListener.java diff --git a/common/net/minecraftforge/event/ListenerList.java b/src/main/java/net/minecraftforge/event/ListenerList.java similarity index 100% rename from common/net/minecraftforge/event/ListenerList.java rename to src/main/java/net/minecraftforge/event/ListenerList.java diff --git a/common/net/minecraftforge/event/ServerChatEvent.java b/src/main/java/net/minecraftforge/event/ServerChatEvent.java similarity index 100% rename from common/net/minecraftforge/event/ServerChatEvent.java rename to src/main/java/net/minecraftforge/event/ServerChatEvent.java diff --git a/common/net/minecraftforge/event/brewing/PotionBrewedEvent.java b/src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java similarity index 100% rename from common/net/minecraftforge/event/brewing/PotionBrewedEvent.java rename to src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java diff --git a/common/net/minecraftforge/event/entity/EntityEvent.java b/src/main/java/net/minecraftforge/event/entity/EntityEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/EntityEvent.java rename to src/main/java/net/minecraftforge/event/entity/EntityEvent.java diff --git a/common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java b/src/main/java/net/minecraftforge/event/entity/EntityJoinWorldEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java rename to src/main/java/net/minecraftforge/event/entity/EntityJoinWorldEvent.java diff --git a/common/net/minecraftforge/event/entity/EntityStruckByLightningEvent.java b/src/main/java/net/minecraftforge/event/entity/EntityStruckByLightningEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/EntityStruckByLightningEvent.java rename to src/main/java/net/minecraftforge/event/entity/EntityStruckByLightningEvent.java diff --git a/common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java b/src/main/java/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java rename to src/main/java/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java diff --git a/common/net/minecraftforge/event/entity/item/ItemEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/item/ItemEvent.java rename to src/main/java/net/minecraftforge/event/entity/item/ItemEvent.java diff --git a/common/net/minecraftforge/event/entity/item/ItemExpireEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/item/ItemExpireEvent.java rename to src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java diff --git a/common/net/minecraftforge/event/entity/item/ItemTossEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/item/ItemTossEvent.java rename to src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java diff --git a/common/net/minecraftforge/event/entity/living/EnderTeleportEvent.java b/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/EnderTeleportEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingAttackEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingDeathEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingDropsEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingDropsEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingDropsEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingFallEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingFallEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingHurtEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingPackSizeEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java diff --git a/common/net/minecraftforge/event/entity/living/LivingSpawnEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/LivingSpawnEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java diff --git a/common/net/minecraftforge/event/entity/living/ZombieEvent.java b/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/living/ZombieEvent.java rename to src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java b/src/main/java/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java rename to src/main/java/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartEvent.java b/src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/minecart/MinecartEvent.java rename to src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java b/src/main/java/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java rename to src/main/java/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java b/src/main/java/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java rename to src/main/java/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java diff --git a/common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java b/src/main/java/net/minecraftforge/event/entity/player/ArrowLooseEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/ArrowLooseEvent.java diff --git a/common/net/minecraftforge/event/entity/player/ArrowNockEvent.java b/src/main/java/net/minecraftforge/event/entity/player/ArrowNockEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/ArrowNockEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/ArrowNockEvent.java diff --git a/common/net/minecraftforge/event/entity/player/AttackEntityEvent.java b/src/main/java/net/minecraftforge/event/entity/player/AttackEntityEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/AttackEntityEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/AttackEntityEvent.java diff --git a/common/net/minecraftforge/event/entity/player/BonemealEvent.java b/src/main/java/net/minecraftforge/event/entity/player/BonemealEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/BonemealEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/BonemealEvent.java diff --git a/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java b/src/main/java/net/minecraftforge/event/entity/player/EntityInteractEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/EntityInteractEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/EntityInteractEvent.java diff --git a/common/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java b/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java diff --git a/common/net/minecraftforge/event/entity/player/FillBucketEvent.java b/src/main/java/net/minecraftforge/event/entity/player/FillBucketEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/FillBucketEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/FillBucketEvent.java diff --git a/common/net/minecraftforge/event/entity/player/ItemTooltipEvent.java b/src/main/java/net/minecraftforge/event/entity/player/ItemTooltipEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/ItemTooltipEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/ItemTooltipEvent.java diff --git a/common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java diff --git a/common/net/minecraftforge/event/entity/player/PlayerDropsEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/PlayerDropsEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java diff --git a/common/net/minecraftforge/event/entity/player/PlayerEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/PlayerEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java diff --git a/common/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java diff --git a/common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java diff --git a/common/net/minecraftforge/event/entity/player/PlayerOpenContainerEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerOpenContainerEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/PlayerOpenContainerEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/PlayerOpenContainerEvent.java diff --git a/common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java diff --git a/common/net/minecraftforge/event/entity/player/UseHoeEvent.java b/src/main/java/net/minecraftforge/event/entity/player/UseHoeEvent.java similarity index 100% rename from common/net/minecraftforge/event/entity/player/UseHoeEvent.java rename to src/main/java/net/minecraftforge/event/entity/player/UseHoeEvent.java diff --git a/common/net/minecraftforge/event/terraingen/BiomeEvent.java b/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/BiomeEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java diff --git a/common/net/minecraftforge/event/terraingen/ChunkProviderEvent.java b/src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/ChunkProviderEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java diff --git a/common/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java b/src/main/java/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java diff --git a/common/net/minecraftforge/event/terraingen/DeferredBiomeDecorator.java b/src/main/java/net/minecraftforge/event/terraingen/DeferredBiomeDecorator.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/DeferredBiomeDecorator.java rename to src/main/java/net/minecraftforge/event/terraingen/DeferredBiomeDecorator.java diff --git a/common/net/minecraftforge/event/terraingen/InitMapGenEvent.java b/src/main/java/net/minecraftforge/event/terraingen/InitMapGenEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/InitMapGenEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/InitMapGenEvent.java diff --git a/common/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java b/src/main/java/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java diff --git a/common/net/minecraftforge/event/terraingen/OreGenEvent.java b/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/OreGenEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java diff --git a/common/net/minecraftforge/event/terraingen/PopulateChunkEvent.java b/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/PopulateChunkEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java diff --git a/common/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java b/src/main/java/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java diff --git a/common/net/minecraftforge/event/terraingen/TerrainGen.java b/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/TerrainGen.java rename to src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java diff --git a/common/net/minecraftforge/event/terraingen/WorldTypeEvent.java b/src/main/java/net/minecraftforge/event/terraingen/WorldTypeEvent.java similarity index 100% rename from common/net/minecraftforge/event/terraingen/WorldTypeEvent.java rename to src/main/java/net/minecraftforge/event/terraingen/WorldTypeEvent.java diff --git a/common/net/minecraftforge/event/world/BlockEvent.java b/src/main/java/net/minecraftforge/event/world/BlockEvent.java similarity index 100% rename from common/net/minecraftforge/event/world/BlockEvent.java rename to src/main/java/net/minecraftforge/event/world/BlockEvent.java diff --git a/common/net/minecraftforge/event/world/ChunkDataEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkDataEvent.java similarity index 100% rename from common/net/minecraftforge/event/world/ChunkDataEvent.java rename to src/main/java/net/minecraftforge/event/world/ChunkDataEvent.java diff --git a/common/net/minecraftforge/event/world/ChunkEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkEvent.java similarity index 100% rename from common/net/minecraftforge/event/world/ChunkEvent.java rename to src/main/java/net/minecraftforge/event/world/ChunkEvent.java diff --git a/common/net/minecraftforge/event/world/ChunkWatchEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java similarity index 100% rename from common/net/minecraftforge/event/world/ChunkWatchEvent.java rename to src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java diff --git a/common/net/minecraftforge/event/world/WorldEvent.java b/src/main/java/net/minecraftforge/event/world/WorldEvent.java similarity index 100% rename from common/net/minecraftforge/event/world/WorldEvent.java rename to src/main/java/net/minecraftforge/event/world/WorldEvent.java diff --git a/common/net/minecraftforge/fluids/BlockFluidBase.java b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java similarity index 100% rename from common/net/minecraftforge/fluids/BlockFluidBase.java rename to src/main/java/net/minecraftforge/fluids/BlockFluidBase.java diff --git a/common/net/minecraftforge/fluids/BlockFluidClassic.java b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java similarity index 100% rename from common/net/minecraftforge/fluids/BlockFluidClassic.java rename to src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java diff --git a/common/net/minecraftforge/fluids/BlockFluidFinite.java b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java similarity index 100% rename from common/net/minecraftforge/fluids/BlockFluidFinite.java rename to src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java diff --git a/common/net/minecraftforge/fluids/Fluid.java b/src/main/java/net/minecraftforge/fluids/Fluid.java similarity index 100% rename from common/net/minecraftforge/fluids/Fluid.java rename to src/main/java/net/minecraftforge/fluids/Fluid.java diff --git a/common/net/minecraftforge/fluids/FluidContainerRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java similarity index 100% rename from common/net/minecraftforge/fluids/FluidContainerRegistry.java rename to src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java diff --git a/common/net/minecraftforge/fluids/FluidEvent.java b/src/main/java/net/minecraftforge/fluids/FluidEvent.java similarity index 100% rename from common/net/minecraftforge/fluids/FluidEvent.java rename to src/main/java/net/minecraftforge/fluids/FluidEvent.java diff --git a/common/net/minecraftforge/fluids/FluidIdMapPacket.java b/src/main/java/net/minecraftforge/fluids/FluidIdMapPacket.java similarity index 100% rename from common/net/minecraftforge/fluids/FluidIdMapPacket.java rename to src/main/java/net/minecraftforge/fluids/FluidIdMapPacket.java diff --git a/common/net/minecraftforge/fluids/FluidRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java similarity index 100% rename from common/net/minecraftforge/fluids/FluidRegistry.java rename to src/main/java/net/minecraftforge/fluids/FluidRegistry.java diff --git a/common/net/minecraftforge/fluids/FluidStack.java b/src/main/java/net/minecraftforge/fluids/FluidStack.java similarity index 100% rename from common/net/minecraftforge/fluids/FluidStack.java rename to src/main/java/net/minecraftforge/fluids/FluidStack.java diff --git a/common/net/minecraftforge/fluids/FluidTank.java b/src/main/java/net/minecraftforge/fluids/FluidTank.java similarity index 100% rename from common/net/minecraftforge/fluids/FluidTank.java rename to src/main/java/net/minecraftforge/fluids/FluidTank.java diff --git a/common/net/minecraftforge/fluids/FluidTankInfo.java b/src/main/java/net/minecraftforge/fluids/FluidTankInfo.java similarity index 100% rename from common/net/minecraftforge/fluids/FluidTankInfo.java rename to src/main/java/net/minecraftforge/fluids/FluidTankInfo.java diff --git a/common/net/minecraftforge/fluids/IFluidBlock.java b/src/main/java/net/minecraftforge/fluids/IFluidBlock.java similarity index 100% rename from common/net/minecraftforge/fluids/IFluidBlock.java rename to src/main/java/net/minecraftforge/fluids/IFluidBlock.java diff --git a/common/net/minecraftforge/fluids/IFluidContainerItem.java b/src/main/java/net/minecraftforge/fluids/IFluidContainerItem.java similarity index 100% rename from common/net/minecraftforge/fluids/IFluidContainerItem.java rename to src/main/java/net/minecraftforge/fluids/IFluidContainerItem.java diff --git a/common/net/minecraftforge/fluids/IFluidHandler.java b/src/main/java/net/minecraftforge/fluids/IFluidHandler.java similarity index 100% rename from common/net/minecraftforge/fluids/IFluidHandler.java rename to src/main/java/net/minecraftforge/fluids/IFluidHandler.java diff --git a/common/net/minecraftforge/fluids/IFluidTank.java b/src/main/java/net/minecraftforge/fluids/IFluidTank.java similarity index 100% rename from common/net/minecraftforge/fluids/IFluidTank.java rename to src/main/java/net/minecraftforge/fluids/IFluidTank.java diff --git a/common/net/minecraftforge/fluids/ItemFluidContainer.java b/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java similarity index 100% rename from common/net/minecraftforge/fluids/ItemFluidContainer.java rename to src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java diff --git a/common/net/minecraftforge/fluids/RenderBlockFluid.java b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java similarity index 100% rename from common/net/minecraftforge/fluids/RenderBlockFluid.java rename to src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java diff --git a/common/net/minecraftforge/fluids/TileFluidHandler.java b/src/main/java/net/minecraftforge/fluids/TileFluidHandler.java similarity index 100% rename from common/net/minecraftforge/fluids/TileFluidHandler.java rename to src/main/java/net/minecraftforge/fluids/TileFluidHandler.java diff --git a/common/net/minecraftforge/liquids/IBlockLiquid.java b/src/main/java/net/minecraftforge/liquids/IBlockLiquid.java similarity index 100% rename from common/net/minecraftforge/liquids/IBlockLiquid.java rename to src/main/java/net/minecraftforge/liquids/IBlockLiquid.java diff --git a/common/net/minecraftforge/liquids/ILiquid.java b/src/main/java/net/minecraftforge/liquids/ILiquid.java similarity index 100% rename from common/net/minecraftforge/liquids/ILiquid.java rename to src/main/java/net/minecraftforge/liquids/ILiquid.java diff --git a/common/net/minecraftforge/liquids/ILiquidTank.java b/src/main/java/net/minecraftforge/liquids/ILiquidTank.java similarity index 100% rename from common/net/minecraftforge/liquids/ILiquidTank.java rename to src/main/java/net/minecraftforge/liquids/ILiquidTank.java diff --git a/common/net/minecraftforge/liquids/ITankContainer.java b/src/main/java/net/minecraftforge/liquids/ITankContainer.java similarity index 100% rename from common/net/minecraftforge/liquids/ITankContainer.java rename to src/main/java/net/minecraftforge/liquids/ITankContainer.java diff --git a/common/net/minecraftforge/liquids/LiquidContainerData.java b/src/main/java/net/minecraftforge/liquids/LiquidContainerData.java similarity index 100% rename from common/net/minecraftforge/liquids/LiquidContainerData.java rename to src/main/java/net/minecraftforge/liquids/LiquidContainerData.java diff --git a/common/net/minecraftforge/liquids/LiquidContainerRegistry.java b/src/main/java/net/minecraftforge/liquids/LiquidContainerRegistry.java similarity index 100% rename from common/net/minecraftforge/liquids/LiquidContainerRegistry.java rename to src/main/java/net/minecraftforge/liquids/LiquidContainerRegistry.java diff --git a/common/net/minecraftforge/liquids/LiquidDictionary.java b/src/main/java/net/minecraftforge/liquids/LiquidDictionary.java similarity index 100% rename from common/net/minecraftforge/liquids/LiquidDictionary.java rename to src/main/java/net/minecraftforge/liquids/LiquidDictionary.java diff --git a/common/net/minecraftforge/liquids/LiquidEvent.java b/src/main/java/net/minecraftforge/liquids/LiquidEvent.java similarity index 100% rename from common/net/minecraftforge/liquids/LiquidEvent.java rename to src/main/java/net/minecraftforge/liquids/LiquidEvent.java diff --git a/common/net/minecraftforge/liquids/LiquidStack.java b/src/main/java/net/minecraftforge/liquids/LiquidStack.java similarity index 100% rename from common/net/minecraftforge/liquids/LiquidStack.java rename to src/main/java/net/minecraftforge/liquids/LiquidStack.java diff --git a/common/net/minecraftforge/liquids/LiquidTank.java b/src/main/java/net/minecraftforge/liquids/LiquidTank.java similarity index 100% rename from common/net/minecraftforge/liquids/LiquidTank.java rename to src/main/java/net/minecraftforge/liquids/LiquidTank.java diff --git a/common/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java similarity index 100% rename from common/net/minecraftforge/oredict/OreDictionary.java rename to src/main/java/net/minecraftforge/oredict/OreDictionary.java diff --git a/common/net/minecraftforge/oredict/RecipeSorter.java b/src/main/java/net/minecraftforge/oredict/RecipeSorter.java similarity index 100% rename from common/net/minecraftforge/oredict/RecipeSorter.java rename to src/main/java/net/minecraftforge/oredict/RecipeSorter.java diff --git a/common/net/minecraftforge/oredict/ShapedOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java similarity index 100% rename from common/net/minecraftforge/oredict/ShapedOreRecipe.java rename to src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java diff --git a/common/net/minecraftforge/oredict/ShapelessOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java similarity index 100% rename from common/net/minecraftforge/oredict/ShapelessOreRecipe.java rename to src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java diff --git a/common/net/minecraftforge/server/ForgeTimeTracker.java b/src/main/java/net/minecraftforge/server/ForgeTimeTracker.java similarity index 100% rename from common/net/minecraftforge/server/ForgeTimeTracker.java rename to src/main/java/net/minecraftforge/server/ForgeTimeTracker.java diff --git a/common/net/minecraftforge/server/command/ForgeCommand.java b/src/main/java/net/minecraftforge/server/command/ForgeCommand.java similarity index 100% rename from common/net/minecraftforge/server/command/ForgeCommand.java rename to src/main/java/net/minecraftforge/server/command/ForgeCommand.java diff --git a/common/net/minecraftforge/transformers/EventTransformer.java b/src/main/java/net/minecraftforge/transformers/EventTransformer.java similarity index 100% rename from common/net/minecraftforge/transformers/EventTransformer.java rename to src/main/java/net/minecraftforge/transformers/EventTransformer.java diff --git a/common/net/minecraftforge/transformers/ForgeAccessTransformer.java b/src/main/java/net/minecraftforge/transformers/ForgeAccessTransformer.java similarity index 100% rename from common/net/minecraftforge/transformers/ForgeAccessTransformer.java rename to src/main/java/net/minecraftforge/transformers/ForgeAccessTransformer.java diff --git a/client/paulscode/sound/codecs/CodecIBXM.java b/src/main/java/paulscode/sound/codecs/CodecIBXM.java similarity index 100% rename from client/paulscode/sound/codecs/CodecIBXM.java rename to src/main/java/paulscode/sound/codecs/CodecIBXM.java diff --git a/common/assets/forge/lang/en_US.lang b/src/main/resources/assets/forge/lang/en_US.lang similarity index 100% rename from common/assets/forge/lang/en_US.lang rename to src/main/resources/assets/forge/lang/en_US.lang diff --git a/common/assets/forge/lang/es_ES.lang b/src/main/resources/assets/forge/lang/es_ES.lang similarity index 100% rename from common/assets/forge/lang/es_ES.lang rename to src/main/resources/assets/forge/lang/es_ES.lang diff --git a/common/assets/forge/lang/fr_FR.lang b/src/main/resources/assets/forge/lang/fr_FR.lang similarity index 100% rename from common/assets/forge/lang/fr_FR.lang rename to src/main/resources/assets/forge/lang/fr_FR.lang diff --git a/common/forge_at.cfg b/src/main/resources/forge_at.cfg similarity index 100% rename from common/forge_at.cfg rename to src/main/resources/forge_at.cfg diff --git a/client/forge_logo.png b/src/main/resources/forge_logo.png similarity index 100% rename from client/forge_logo.png rename to src/main/resources/forge_logo.png