mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 08:39:58 +03:00
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
|
|
@@ -21,7 +21,6 @@
|
|
import java.net.SocketAddress;
|
|
import java.nio.ByteBuffer;
|
|
import java.nio.ByteOrder;
|
|
-import java.nio.IntBuffer;
|
|
import java.text.DecimalFormat;
|
|
import java.text.MessageFormat;
|
|
import java.text.SimpleDateFormat;
|
|
@@ -37,9 +36,8 @@
|
|
import java.util.concurrent.FutureTask;
|
|
import javax.annotation.Nullable;
|
|
import javax.imageio.ImageIO;
|
|
-import net.minecraft.block.Block;
|
|
+
|
|
import net.minecraft.block.material.Material;
|
|
-import net.minecraft.block.state.IBlockState;
|
|
import net.minecraft.client.audio.MusicTicker;
|
|
import net.minecraft.client.audio.SoundHandler;
|
|
import net.minecraft.client.entity.EntityPlayerSP;
|
|
@@ -60,7 +58,6 @@
|
|
import net.minecraft.client.gui.achievement.GuiAchievement;
|
|
import net.minecraft.client.gui.inventory.GuiInventory;
|
|
import net.minecraft.client.main.GameConfiguration;
|
|
-import net.minecraft.client.multiplayer.GuiConnecting;
|
|
import net.minecraft.client.multiplayer.PlayerControllerMP;
|
|
import net.minecraft.client.multiplayer.ServerData;
|
|
import net.minecraft.client.multiplayer.WorldClient;
|
|
@@ -116,20 +113,9 @@
|
|
import net.minecraft.crash.CrashReportCategory;
|
|
import net.minecraft.crash.ICrashReportDetail;
|
|
import net.minecraft.entity.Entity;
|
|
-import net.minecraft.entity.EntityLeashKnot;
|
|
-import net.minecraft.entity.EntityList;
|
|
-import net.minecraft.entity.item.EntityArmorStand;
|
|
-import net.minecraft.entity.item.EntityBoat;
|
|
-import net.minecraft.entity.item.EntityEnderCrystal;
|
|
-import net.minecraft.entity.item.EntityItemFrame;
|
|
-import net.minecraft.entity.item.EntityMinecart;
|
|
-import net.minecraft.entity.item.EntityPainting;
|
|
import net.minecraft.entity.player.EntityPlayer;
|
|
-import net.minecraft.entity.player.InventoryPlayer;
|
|
import net.minecraft.init.Bootstrap;
|
|
import net.minecraft.init.Items;
|
|
-import net.minecraft.item.Item;
|
|
-import net.minecraft.item.ItemMonsterPlacer;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.nbt.NBTTagCompound;
|
|
import net.minecraft.nbt.NBTTagList;
|
|
@@ -175,6 +161,7 @@
|
|
import net.minecraft.util.text.TextComponentString;
|
|
import net.minecraft.util.text.TextFormatting;
|
|
import net.minecraft.world.EnumDifficulty;
|
|
+import net.minecraft.world.MinecraftException;
|
|
import net.minecraft.world.WorldProviderEnd;
|
|
import net.minecraft.world.WorldProviderHell;
|
|
import net.minecraft.world.WorldSettings;
|
|
@@ -2867,8 +2854,7 @@
|
|
return this.theIntegratedServer;
|
|
}
|
|
|
|
- public static void stopIntegratedServer()
|
|
- {
|
|
+ public static void stopIntegratedServer() throws MinecraftException {
|
|
if (theMinecraft != null)
|
|
{
|
|
IntegratedServer integratedserver = theMinecraft.getIntegratedServer();
|