refac: перенос классов

client/src/main/java/net/minecraft/client/Minecraft.java

@@ -10,6 +10,8 @@ import java.awt.Graphics;
 import java.io.File;
 import java.text.DecimalFormat;
 
+import net.minecraft.client.render.ItemRenderer;
+import net.minecraft.client.utils.*;
 import net.minecraft.src.*;
 import ru.di9.minecraft.shared.*;
 import ru.di9.minecraft.shared.anvil.AnvilSaveConverter;
@@ -19,7 +21,6 @@ import ru.di9.minecraft.shared.chunk.ChunkProviderLoadOrGenerate;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.entity.EntityRenderer;
-import net.minecraft.client.utils.EnumOS;
 import net.minecraft.client.gui.GuiAchievement;
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.GuiConflictWarning;
@@ -39,8 +40,7 @@ import ru.di9.minecraft.shared.item.Item;
 import ru.di9.minecraft.shared.item.ItemBlock;
 import ru.di9.minecraft.shared.MinecraftException;
 import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.utils.MouseHelper;
-import net.minecraft.client.utils.OpenGlHelper;
+
 import ru.di9.minecraft.shared.block.Block;
 import ru.di9.minecraft.shared.entity.EntityLiving;
 import ru.di9.minecraft.shared.entity.EntityPlayer;
@@ -60,7 +60,7 @@ import net.minecraft.client.texture.TexturePortalFX;
 import net.minecraft.client.texture.TextureWatchFX;
 import net.minecraft.client.texture.TextureWaterFX;
 import net.minecraft.client.texture.TextureWaterFlowFX;
-import net.minecraft.client.utils.Timer;
+
 import ru.di9.minecraft.shared.player.Profiler;
 import ru.di9.minecraft.shared.player.ProfilerResult;
 import ru.di9.minecraft.shared.utils.EnumMovingObjectType;

client/src/main/java/net/minecraft/client/entity/EntityRenderer.java

@@ -6,9 +6,11 @@ import java.util.Random;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.fx.EntityRainFX;
 import net.minecraft.client.entity.fx.EntitySmokeFX;
+import net.minecraft.client.render.ItemRenderer;
 import net.minecraft.client.render.RenderGlobal;
 import net.minecraft.client.render.RenderHelper;
 import net.minecraft.client.utils.ClippingHelperImpl;
+import net.minecraft.client.utils.GLAllocation;
 import net.minecraft.client.utils.MouseFilter;
 import net.minecraft.client.utils.OpenGlHelper;
 import net.minecraft.src.*;

client/src/main/java/net/minecraft/client/model/ModelRenderer.java

@@ -3,7 +3,7 @@ package net.minecraft.client.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.src.GLAllocation;
+import net.minecraft.client.utils.GLAllocation;
 import net.minecraft.src.Tessellator;
 import net.minecraft.client.texture.TextureOffset;
 import org.lwjgl.opengl.GL11;

client/src/main/java/net/minecraft/client/render/ItemRenderer.java

@@ -1,10 +1,12 @@
-package net.minecraft.src;
+package net.minecraft.client.render;
 
 import net.minecraft.client.GlobalBeans;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.render.*;
 import net.minecraft.client.utils.OpenGlHelper;
+import net.minecraft.src.MapItemRenderer;
+import net.minecraft.src.Tessellator;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 import ru.di9.minecraft.shared.block.Block;

client/src/main/java/net/minecraft/client/render/RenderEndPortal.java

@@ -4,7 +4,7 @@ import java.nio.FloatBuffer;
 import java.util.Random;
 
 import net.minecraft.src.ActiveRenderInfo;
-import net.minecraft.src.GLAllocation;
+import net.minecraft.client.utils.GLAllocation;
 import net.minecraft.src.Tessellator;
 import net.minecraft.client.entity.tile.TileEntitySpecialRenderer;
 import org.lwjgl.opengl.GL11;

client/src/main/java/net/minecraft/client/render/RenderEngine.java

@@ -18,6 +18,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.client.texture.TextureFX;
 import net.minecraft.client.texture.TexturePackBase;
 import net.minecraft.client.texture.TexturePackList;
+import net.minecraft.client.utils.GLAllocation;
 import net.minecraft.src.*;
 import org.lwjgl.opengl.GL11;
 

client/src/main/java/net/minecraft/client/render/RenderGlobal.java

@@ -7,6 +7,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.*;
 import net.minecraft.client.entity.fx.*;
 import net.minecraft.client.entity.tile.TileEntityRenderer;
+import net.minecraft.client.utils.GLAllocation;
 import net.minecraft.src.*;
 import org.lwjgl.opengl.ARBOcclusionQuery;
 import org.lwjgl.opengl.GL11;

client/src/main/java/net/minecraft/client/render/RenderHelper.java

@@ -2,7 +2,7 @@ package net.minecraft.client.render;
 
 import java.nio.FloatBuffer;
 
-import net.minecraft.src.GLAllocation;
+import net.minecraft.client.utils.GLAllocation;
 import org.lwjgl.opengl.GL11;
 import ru.di9.minecraft.shared.utils.Vec3D;
 

client/src/main/java/net/minecraft/client/render/RenderList.java

@@ -2,7 +2,7 @@ package net.minecraft.client.render;
 
 import java.nio.IntBuffer;
 
-import net.minecraft.src.GLAllocation;
+import net.minecraft.client.utils.GLAllocation;
 import org.lwjgl.opengl.GL11;
 
 public class RenderList

client/src/main/java/net/minecraft/client/render/RenderManager.java

@@ -6,7 +6,7 @@ import net.minecraft.client.model.*;
 import net.minecraft.client.utils.OpenGlHelper;
 import net.minecraft.src.FontRenderer;
 import net.minecraft.src.GameSettings;
-import net.minecraft.src.ItemRenderer;
+
 import org.lwjgl.opengl.GL11;
 import ru.di9.minecraft.shared.block.Block;
 import ru.di9.minecraft.shared.entity.*;

client/src/main/java/net/minecraft/client/utils/ClippingHelperImpl.java

@@ -2,7 +2,6 @@ package net.minecraft.client.utils;
 
 import java.nio.FloatBuffer;
 
-import net.minecraft.src.GLAllocation;
 import org.lwjgl.opengl.GL11;
 import ru.di9.minecraft.shared.utils.MathHelper;
 

client/src/main/java/net/minecraft/client/utils/GLAllocation.java

@@ -1,10 +1,11 @@
-package net.minecraft.src;
+package net.minecraft.client.utils;
 
 import java.nio.*;
 import java.util.ArrayList;
 import java.util.List;
 import org.lwjgl.opengl.GL11;
 
+@SuppressWarnings("all")
 public class GLAllocation
 {
     /**

client/src/main/java/net/minecraft/client/utils/MouseHelper.java

@@ -3,7 +3,6 @@ package net.minecraft.client.utils;
 import java.awt.Component;
 import java.nio.IntBuffer;
 
-import net.minecraft.src.GLAllocation;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.input.Cursor;
 import org.lwjgl.input.Mouse;

client/src/main/java/net/minecraft/src/ActiveRenderInfo.java

@@ -4,6 +4,9 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.GLU;
+
+import net.minecraft.client.utils.GLAllocation;
+
 import ru.di9.minecraft.shared.block.Block;
 import ru.di9.minecraft.shared.block.BlockFluid;
 import ru.di9.minecraft.shared.chunk.ChunkPosition;

client/src/main/java/net/minecraft/src/Tessellator.java

@@ -2,6 +2,7 @@ package net.minecraft.src;
 
 import java.nio.*;
 
+import net.minecraft.client.utils.GLAllocation;
 import net.minecraft.client.utils.OpenGlHelper;
 import org.lwjgl.opengl.*;