refac: удалена лишняя реализация

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

@@ -10,22 +10,16 @@ import java.awt.Graphics;
 import java.io.File;
 import java.text.DecimalFormat;
 
+import net.minecraft.src.*;
 import ru.di9.minecraft.shared.*;
 import ru.di9.minecraft.shared.anvil.AnvilSaveConverter;
 import ru.di9.minecraft.shared.achievement.AchievementList;
 import ru.di9.minecraft.shared.chunk.ChunkCoordinates;
 import ru.di9.minecraft.shared.chunk.ChunkProviderLoadOrGenerate;
-import net.minecraft.src.ColorizerWater;
-import net.minecraft.src.EffectRenderer;
 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.src.EnumOptions;
-import net.minecraft.src.FontRenderer;
-import net.minecraft.src.GLAllocation;
-import net.minecraft.src.GameSettings;
-import net.minecraft.src.GameWindowListener;
 import net.minecraft.client.gui.GuiAchievement;
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.GuiConflictWarning;
@@ -43,36 +37,21 @@ import ru.di9.minecraft.shared.ISaveFormat;
 import ru.di9.minecraft.shared.chunk.IChunkProvider;
 import ru.di9.minecraft.shared.item.Item;
 import ru.di9.minecraft.shared.item.ItemBlock;
-import net.minecraft.src.ItemRenderer;
-import net.minecraft.src.KeyBinding;
-import net.minecraft.src.LoadingScreenRenderer;
-import net.minecraft.src.MinecraftError;
 import ru.di9.minecraft.shared.MinecraftException;
-import net.minecraft.src.MinecraftImpl;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.utils.MouseHelper;
-import net.minecraft.src.MovementInputFromOptions;
-import net.minecraft.src.NetClientHandler;
-import net.minecraft.src.OpenGlCapsChecker;
 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;
 import ru.di9.minecraft.shared.item.ItemStack;
 import ru.di9.minecraft.shared.network.packet.Packet3Chat;
-import net.minecraft.src.PlayerController;
 import net.minecraft.client.render.RenderBlocks;
 import net.minecraft.client.render.RenderEngine;
 import net.minecraft.client.render.RenderGlobal;
 import net.minecraft.client.render.RenderManager;
-import net.minecraft.src.ScaledResolution;
-import net.minecraft.src.ScreenShotHelper;
-import net.minecraft.src.Session;
 import net.minecraft.client.sound.SoundManager;
-import net.minecraft.src.StatFileWriter;
-import net.minecraft.src.StatStringFormatKeyInv;
 import ru.di9.minecraft.shared.Teleporter;
-import net.minecraft.src.Tessellator;
 import net.minecraft.client.texture.TextureCompassFX;
 import net.minecraft.client.texture.TextureFlamesFX;
 import net.minecraft.client.texture.TextureLavaFX;
@@ -82,18 +61,13 @@ 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.src.ThreadCheckHasPaid;
-import net.minecraft.src.ThreadClientSleep;
-import net.minecraft.src.ThreadDownloadResources;
 import net.minecraft.client.utils.Timer;
-import net.minecraft.src.UnexpectedThrowable;
 import ru.di9.minecraft.shared.player.Profiler;
 import ru.di9.minecraft.shared.player.ProfilerResult;
 import ru.di9.minecraft.shared.utils.EnumMovingObjectType;
 import ru.di9.minecraft.shared.utils.StringTranslate;
 import ru.di9.minecraft.shared.world.World;
 import ru.di9.minecraft.shared.world.WorldProvider;
-import net.minecraft.src.WorldRenderer;
 import ru.di9.minecraft.shared.world.WorldSettings;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.Sys;
@@ -112,7 +86,7 @@ import ru.di9.minecraft.shared.utils.Vec3D;
 import ru.di9.minecraft.shared.world.WorldType;
 
 @SuppressWarnings("all")
-public abstract class Minecraft implements Runnable
+public class Minecraft implements Runnable
 {
     public static byte field_28006_b[] = new byte[0xa00000];
 
@@ -262,7 +236,10 @@ public abstract class Minecraft implements Runnable
     /** Join player counter */
     private int joinPlayerCounter;
 
-    public Minecraft(Component par1Component, Canvas par2Canvas, int par4, int par5, boolean par6)
+    /** Reference to the main frame. */
+    private Frame mcFrame;
+
+    public Minecraft(Component par1Component, Canvas par2Canvas, int par4, int par5, boolean par6, Frame par7Frame)
     {
         fullscreen = false;
         hasCrashed = false;
@@ -303,6 +280,8 @@ public abstract class Minecraft implements Runnable
         fullscreen = par6;
 
         theMinecraft = this;
+
+        mcFrame = par7Frame;
     }
 
     public void onMinecraftCrash(UnexpectedThrowable par1UnexpectedThrowable)
@@ -314,7 +293,11 @@ public abstract class Minecraft implements Runnable
     /**
      * Displays an unexpected error that has come up during the game.
      */
-    public abstract void displayUnexpectedThrowable(UnexpectedThrowable unexpectedthrowable);
+    public void displayUnexpectedThrowable(UnexpectedThrowable unexpectedthrowable) {
+        mcFrame.removeAll();
+        mcFrame.add(new PanelCrashReport(unexpectedthrowable), "Center");
+        mcFrame.validate();
+    }
 
     public void setServer(String par1Str, int par2)
     {
@@ -2346,7 +2329,7 @@ public abstract class Minecraft implements Runnable
         canvas.setPreferredSize(new Dimension(854, 480));
         frame.pack();
         frame.setLocationRelativeTo(null);
-        MinecraftImpl minecraftimpl = new MinecraftImpl(frame, canvas, 854, 480, flag, frame);
+        Minecraft minecraftimpl = new Minecraft(frame, canvas, 854, 480, flag, frame);
         Thread thread = new Thread(minecraftimpl, "Minecraft main thread");
         thread.setPriority(10);
         minecraftimpl.minecraftUri = "www.minecraft.net";

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

@@ -1,27 +0,0 @@
-package net.minecraft.src;
-
-import java.awt.*;
-import net.minecraft.client.Minecraft;
-
-@SuppressWarnings("all")
-public final class MinecraftImpl extends Minecraft
-{
-    /** Reference to the main frame. */
-    final Frame mcFrame;
-
-    public MinecraftImpl(Component par1Component, Canvas par2Canvas, int par4, int par5, boolean par6, Frame par7Frame)
-    {
-        super(par1Component, par2Canvas, par4, par5, par6);
-        mcFrame = par7Frame;
-    }
-
-    /**
-     * Displays an unexpected error that has come up during the game.
-     */
-    public void displayUnexpectedThrowable(UnexpectedThrowable par1UnexpectedThrowable)
-    {
-        mcFrame.removeAll();
-        mcFrame.add(new PanelCrashReport(par1UnexpectedThrowable), "Center");
-        mcFrame.validate();
-    }
-}