arves100
/
tmcw_diff
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
tmcw_diff/tmcv5_hybrid_server.patch

1773 lines
56 KiB
Diff
Raw Permalink Blame History

*** /dev/null Thu Jan 1 01:00:00 1970
--- StartServer.java Sat Feb 5 05:57:45 2022
***************
*** 0 ****
--- 1,20 ----
+ import java.io.File;
+ import java.lang.reflect.Field;
+ import java.util.Arrays;
+
+ import net.minecraft.server.main.Main;
+
+ public class StartServer
+ {
+ public static void main(String[] args)
+ {
+ Main.main(concat(new String[] {"--version", "mcp"}, args));
+ }
+
+ public static <T> T[] concat(T[] first, T[] second)
+ {
+ T[] result = Arrays.copyOf(first, first.length + second.length);
+ System.arraycopy(second, 0, result, first.length, second.length);
+ return result;
+ }
+ }
*** net/minecraft/client/ClientBrandRetriever.java Fri Feb 4 19:29:58 2022
--- net/minecraft/client/ClientBrandRetriever.java Sat Feb 5 05:46:59 2022
***************
*** 1,9 ****
package net.minecraft.client;
public class ClientBrandRetriever
{
public static String getClientModName()
{
! return "vanilla";
}
}
--- 1,11 ----
package net.minecraft.client;
+ import net.minecraft.src.Minecraft;
+
public class ClientBrandRetriever
{
public static String getClientModName()
{
! return Minecraft.VERSION;
}
}
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/server/main/Main.java Sat Feb 5 05:57:07 2022
***************
*** 0 ****
--- 1,136 ----
+ package net.minecraft.server.main;
+
+ import net.minecraft.server.MinecraftServerGui;
+ import net.minecraft.src.DedicatedServer;
+ import net.minecraft.src.ILogAgent;
+ import net.minecraft.src.StatList;
+ import net.minecraft.src.ThreadDedicatedServer;
+
+ import java.awt.*;
+ import java.io.File;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+
+ public class Main {
+
+ public static void main(String[] par0ArrayOfStr)
+ {
+ StatList.nopInit();
+ ILogAgent var1 = null;
+
+ try
+ {
+ boolean var2 = !GraphicsEnvironment.isHeadless();
+ String var3 = null;
+ String var4 = ".";
+ String var5 = null;
+ boolean var6 = false;
+ boolean var7 = false;
+ int var8 = -1;
+
+ for (int var9 = 0; var9 < par0ArrayOfStr.length; ++var9)
+ {
+ String var10 = par0ArrayOfStr[var9];
+ String var11 = var9 == par0ArrayOfStr.length - 1 ? null : par0ArrayOfStr[var9 + 1];
+ boolean var12 = false;
+
+ if (!var10.equals("nogui") && !var10.equals("--nogui"))
+ {
+ if (var10.equals("--port") && var11 != null)
+ {
+ var12 = true;
+
+ try
+ {
+ var8 = Integer.parseInt(var11);
+ }
+ catch (NumberFormatException var14)
+ {
+ ;
+ }
+ }
+ else if (var10.equals("--singleplayer") && var11 != null)
+ {
+ var12 = true;
+ var3 = var11;
+ }
+ else if (var10.equals("--universe") && var11 != null)
+ {
+ var12 = true;
+ var4 = var11;
+ }
+ else if (var10.equals("--world") && var11 != null)
+ {
+ var12 = true;
+ var5 = var11;
+ }
+ else if (var10.equals("--demo"))
+ {
+ var6 = true;
+ }
+ else if (var10.equals("--bonusChest"))
+ {
+ var7 = true;
+ }
+ }
+ else
+ {
+ var2 = false;
+ }
+
+ if (var12)
+ {
+ ++var9;
+ }
+ }
+
+ DedicatedServer var16 = new DedicatedServer(new File(var4));
+ var1 = var16.getLogAgent();
+
+ if (var3 != null)
+ {
+ var16.setServerOwner(var3);
+ }
+
+ if (var5 != null)
+ {
+ var16.setFolderName(var5);
+ }
+
+ if (var8 >= 0)
+ {
+ var16.setServerPort(var8);
+ }
+
+ if (var6)
+ {
+ var16.setDemo(true);
+ }
+
+ if (var7)
+ {
+ var16.canCreateBonusChest(true);
+ }
+
+ if (var2)
+ {
+ MinecraftServerGui.func_120016_a(var16);
+ var16.setGuiEnabled(true);
+ }
+
+ var16.startServerThread();
+ Runtime.getRuntime().addShutdownHook(new ThreadDedicatedServer(var16));
+ }
+ catch (Exception var15)
+ {
+ if (var1 != null)
+ {
+ var1.logSevereException("Failed to start the minecraft server", var15);
+ }
+ else
+ {
+ Logger.getAnonymousLogger().log(Level.SEVERE, "Failed to start the minecraft server", var15);
+ }
+ }
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/server/MinecraftServerGui.java Sat Feb 5 05:52:56 2022
***************
*** 0 ****
--- 1,98 ----
+ package net.minecraft.server;
+
+ import net.minecraft.src.*;
+
+ import java.awt.BorderLayout;
+ import java.awt.Component;
+ import java.awt.Dimension;
+ import javax.swing.JComponent;
+ import javax.swing.JFrame;
+ import javax.swing.JPanel;
+ import javax.swing.JScrollPane;
+ import javax.swing.JTextArea;
+ import javax.swing.JTextField;
+ import javax.swing.UIManager;
+ import javax.swing.border.EtchedBorder;
+ import javax.swing.border.TitledBorder;
+
+ public class MinecraftServerGui extends JComponent
+ {
+ private static boolean field_120022_a;
+ private DedicatedServer field_120021_b;
+
+ public static void func_120016_a(DedicatedServer par0DedicatedServer)
+ {
+ try
+ {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ }
+ catch (Exception var3)
+ {
+ ;
+ }
+
+ MinecraftServerGui var1 = new MinecraftServerGui(par0DedicatedServer);
+ field_120022_a = true;
+ JFrame var2 = new JFrame(Minecraft.WINDOW_TITLE + " Server");
+ var2.add(var1);
+ var2.pack();
+ var2.setLocationRelativeTo((Component)null);
+ var2.setVisible(true);
+ var2.addWindowListener(new MinecraftServerGuiINNER1(par0DedicatedServer));
+ }
+
+ public MinecraftServerGui(DedicatedServer par1DedicatedServer)
+ {
+ this.field_120021_b = par1DedicatedServer;
+ this.setPreferredSize(new Dimension(854, 480));
+ this.setLayout(new BorderLayout());
+
+ try
+ {
+ this.add(this.func_120018_d(), "Center");
+ this.add(this.func_120019_b(), "West");
+ }
+ catch (Exception var3)
+ {
+ var3.printStackTrace();
+ }
+ }
+
+ private JComponent func_120019_b()
+ {
+ JPanel var1 = new JPanel(new BorderLayout());
+ var1.add(new StatsComponent(this.field_120021_b), "North");
+ var1.add(this.func_120020_c(), "Center");
+ var1.setBorder(new TitledBorder(new EtchedBorder(), "Stats"));
+ return var1;
+ }
+
+ private JComponent func_120020_c()
+ {
+ PlayerListComponent var1 = new PlayerListComponent(this.field_120021_b);
+ JScrollPane var2 = new JScrollPane(var1, 22, 30);
+ var2.setBorder(new TitledBorder(new EtchedBorder(), "Players"));
+ return var2;
+ }
+
+ private JComponent func_120018_d()
+ {
+ JPanel var1 = new JPanel(new BorderLayout());
+ JTextArea var2 = new JTextArea();
+ this.field_120021_b.getLogAgent().getServerLogger().addHandler(new TextAreaLogHandler(var2));
+ JScrollPane var3 = new JScrollPane(var2, 22, 30);
+ var2.setEditable(false);
+ JTextField var4 = new JTextField();
+ var4.addActionListener(new MinecraftServerGuiINNER2(this, var4));
+ var2.addFocusListener(new MinecraftServerGuiINNER3(this));
+ var1.add(var3, "Center");
+ var1.add(var4, "South");
+ var1.setBorder(new TitledBorder(new EtchedBorder(), "Log and chat"));
+ return var1;
+ }
+
+ static DedicatedServer func_120017_a(MinecraftServerGui par0MinecraftServerGui)
+ {
+ return par0MinecraftServerGui.field_120021_b;
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/server/MinecraftServerGuiINNER1.java Sat Feb 5 05:43:25 2022
***************
*** 0 ****
--- 1,35 ----
+ package net.minecraft.server;
+
+ import net.minecraft.src.DedicatedServer;
+
+ import java.awt.event.WindowAdapter;
+ import java.awt.event.WindowEvent;
+
+ final class MinecraftServerGuiINNER1 extends WindowAdapter
+ {
+ final DedicatedServer field_120023_a;
+
+ MinecraftServerGuiINNER1(DedicatedServer par1DedicatedServer)
+ {
+ this.field_120023_a = par1DedicatedServer;
+ }
+
+ public void windowClosing(WindowEvent par1WindowEvent)
+ {
+ this.field_120023_a.initiateShutdown();
+
+ while (!this.field_120023_a.isServerStopped())
+ {
+ try
+ {
+ Thread.sleep(100L);
+ }
+ catch (InterruptedException var3)
+ {
+ var3.printStackTrace();
+ }
+ }
+
+ System.exit(0);
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/server/MinecraftServerGuiINNER2.java Sat Feb 5 05:43:25 2022
***************
*** 0 ****
--- 1,31 ----
+ package net.minecraft.server;
+
+ import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
+ import javax.swing.JTextField;
+ import net.minecraft.server.MinecraftServer;
+
+ class MinecraftServerGuiINNER2 implements ActionListener
+ {
+ final JTextField field_120025_a;
+
+ final MinecraftServerGui field_120024_b;
+
+ MinecraftServerGuiINNER2(MinecraftServerGui par1MinecraftServerGui, JTextField par2JTextField)
+ {
+ this.field_120024_b = par1MinecraftServerGui;
+ this.field_120025_a = par2JTextField;
+ }
+
+ public void actionPerformed(ActionEvent par1ActionEvent)
+ {
+ String var2 = this.field_120025_a.getText().trim();
+
+ if (var2.length() > 0)
+ {
+ MinecraftServerGui.func_120017_a(this.field_120024_b).addPendingCommand(var2, MinecraftServer.getServer());
+ }
+
+ this.field_120025_a.setText("");
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/server/MinecraftServerGuiINNER3.java Sat Feb 5 05:43:51 2022
***************
*** 0 ****
--- 1,16 ----
+ package net.minecraft.server;
+
+ import java.awt.event.FocusAdapter;
+ import java.awt.event.FocusEvent;
+
+ class MinecraftServerGuiINNER3 extends FocusAdapter
+ {
+ final MinecraftServerGui field_120032_a;
+
+ MinecraftServerGuiINNER3(MinecraftServerGui par1MinecraftServerGui)
+ {
+ this.field_120032_a = par1MinecraftServerGui;
+ }
+
+ public void focusGained(FocusEvent par1FocusEvent) {}
+ }
*** net/minecraft/server/MinecraftServer.java Fri Feb 4 19:29:58 2022
--- net/minecraft/server/MinecraftServer.java Sat Feb 5 06:00:12 2022
***************
*** 8,60 ****
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
! import net.minecraft.src.AnvilSaveConverter;
! import net.minecraft.src.AxisAlignedBB;
! import net.minecraft.src.BlocksMined;
! import net.minecraft.src.CallableIsServerModded;
! import net.minecraft.src.CallableServerMemoryStats;
! import net.minecraft.src.CallableServerProfiler;
! import net.minecraft.src.ChatMessageComponent;
! import net.minecraft.src.ChunkCoordinates;
! import net.minecraft.src.CommandBase;
! import net.minecraft.src.CrashReport;
! import net.minecraft.src.DemoWorldServer;
! import net.minecraft.src.DispenserBehaviors;
! import net.minecraft.src.EntityPlayer;
! import net.minecraft.src.EnumGameType;
! import net.minecraft.src.GuiIngameTMCW;
! import net.minecraft.src.ICommandManager;
! import net.minecraft.src.ICommandSender;
! import net.minecraft.src.ILogAgent;
! import net.minecraft.src.IPlayerUsage;
! import net.minecraft.src.IProgressUpdate;
! import net.minecraft.src.ISaveFormat;
! import net.minecraft.src.ISaveHandler;
! import net.minecraft.src.IUpdatePlayerListBox;
! import net.minecraft.src.MathHelper;
! import net.minecraft.src.MinecraftException;
! import net.minecraft.src.NetworkListenThread;
! import net.minecraft.src.Packet;
! import net.minecraft.src.Packet4UpdateTime;
! import net.minecraft.src.PlayerManager;
! import net.minecraft.src.PlayerUsageSnooper;
! import net.minecraft.src.Profiler;
! import net.minecraft.src.RConConsoleSource;
! import net.minecraft.src.ReportedException;
! import net.minecraft.src.ServerCommandManager;
! import net.minecraft.src.ServerConfigurationManager;
! import net.minecraft.src.ThreadMinecraftServer;
! import net.minecraft.src.World;
! import net.minecraft.src.WorldInfo;
! import net.minecraft.src.WorldManager;
! import net.minecraft.src.WorldServer;
! import net.minecraft.src.WorldServerMulti;
! import net.minecraft.src.WorldSettings;
! import net.minecraft.src.WorldType;
public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage
{
/** Instance of Minecraft Server. */
private static MinecraftServer mcServer;
--- 8,19 ----
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
!
! import net.minecraft.src.*;
public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage
{
/** Instance of Minecraft Server. */
private static MinecraftServer mcServer;
***************
*** 131,141 ****
public long[][] timeOfLastDimensionTick;
public final long[] sentPacketCountArray = new long[100];
public final long[] sentPacketSizeArray = new long[100];
public final long[] receivedPacketCountArray = new long[100];
public final long[] receivedPacketSizeArray = new long[100];
! private final int[] tickTimeArray = new int[100];
private KeyPair serverKeyPair;
/** Username of the server owner (for integrated servers) */
private String serverOwner;
private String folderName;
--- 90,100 ----
public long[][] timeOfLastDimensionTick;
public final long[] sentPacketCountArray = new long[100];
public final long[] sentPacketSizeArray = new long[100];
public final long[] receivedPacketCountArray = new long[100];
public final long[] receivedPacketSizeArray = new long[100];
! public final int[] tickTimeArray = new int[100]; // need public for server
private KeyPair serverKeyPair;
/** Username of the server owner (for integrated servers) */
private String serverOwner;
private String folderName;
***************
*** 761,771 ****
/**
* Returns the server's Minecraft version as string.
*/
public String getMinecraftVersion()
{
! return "TMCWv5";
}
/**
* Returns the number of players currently on the server.
*/
--- 720,730 ----
/**
* Returns the server's Minecraft version as string.
*/
public String getMinecraftVersion()
{
! return Minecraft.VERSION;
}
/**
* Returns the number of players currently on the server.
*/
***************
*** 832,842 ****
}
}
public String getServerModName()
{
! return "vanilla";
}
/**
* Adds the server info, including from theWorldServer, to the crash report.
*/
--- 791,801 ----
}
}
public String getServerModName()
{
! return Minecraft.VERSION;
}
/**
* Adds the server info, including from theWorldServer, to the crash report.
*/
***************
*** 1390,1396 ****
--- 1349,1360 ----
}
public static final long getCachedSystemTime()
{
return cachedTime;
+ }
+
+ public void func_82010_a(IUpdatePlayerListBox par1IUpdatePlayerListBox)
+ {
+ this.tickables.add(par1IUpdatePlayerListBox);
}
}
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/src/PlayerListComponent.java Sat Feb 5 04:19:58 2022
***************
*** 0 ****
--- 1,35 ----
+ package net.minecraft.src;
+
+ import java.util.Vector;
+ import javax.swing.JList;
+ import net.minecraft.server.MinecraftServer;
+
+ public class PlayerListComponent extends JList implements IUpdatePlayerListBox
+ {
+ private MinecraftServer field_120015_a;
+ private int field_120014_b;
+
+ public PlayerListComponent(MinecraftServer par1MinecraftServer)
+ {
+ this.field_120015_a = par1MinecraftServer;
+ par1MinecraftServer.func_82010_a(this);
+ }
+
+ /**
+ * Updates the JList with a new model.
+ */
+ public void update()
+ {
+ if (this.field_120014_b++ % 20 == 0)
+ {
+ Vector var1 = new Vector();
+
+ for (int var2 = 0; var2 < this.field_120015_a.getConfigurationManager().playerEntityList.size(); ++var2)
+ {
+ var1.add(((EntityPlayerMP)this.field_120015_a.getConfigurationManager().playerEntityList.get(var2)).getCommandSenderName());
+ }
+
+ this.setListData(var1);
+ }
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/src/StatsComponent.java Sat Feb 5 05:41:43 2022
***************
*** 0 ****
--- 1,112 ----
+ package net.minecraft.src;
+
+ import java.awt.Color;
+ import java.awt.Dimension;
+ import java.awt.Graphics;
+ import java.text.DecimalFormat;
+ import javax.swing.JComponent;
+ import javax.swing.Timer;
+ import net.minecraft.server.MinecraftServer;
+
+ public class StatsComponent extends JComponent
+ {
+ private static final DecimalFormat field_120040_a = new DecimalFormat("########0.000");
+ private int[] field_120038_b = new int[256];
+ private int field_120039_c;
+ private String[] field_120036_d = new String[11];
+ private final MinecraftServer field_120037_e;
+
+ public StatsComponent(MinecraftServer par1MinecraftServer)
+ {
+ this.field_120037_e = par1MinecraftServer;
+ this.setPreferredSize(new Dimension(456, 246));
+ this.setMinimumSize(new Dimension(456, 246));
+ this.setMaximumSize(new Dimension(456, 246));
+ (new Timer(500, new StatsComponentINNER1(this))).start();
+ this.setBackground(Color.BLACK);
+ }
+
+ private void func_120034_a()
+ {
+ long var1 = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+ System.gc();
+ this.field_120036_d[0] = "Memory use: " + var1 / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)";
+ this.field_120036_d[1] = "Threads: " + TcpConnection.field_74471_a.get() + " + " + TcpConnection.field_74469_b.get();
+ this.field_120036_d[2] = "Avg tick: " + field_120040_a.format(this.func_120035_a_int(this.field_120037_e.tickTimeArray) * 1.0E-6D) + " ms";
+ this.field_120036_d[3] = "Avg sent: " + (int)this.func_120035_a(this.field_120037_e.sentPacketCountArray) + ", Avg size: " + (int)this.func_120035_a(this.field_120037_e.sentPacketSizeArray);
+ this.field_120036_d[4] = "Avg rec: " + (int)this.func_120035_a(this.field_120037_e.receivedPacketCountArray) + ", Avg size: " + (int)this.func_120035_a(this.field_120037_e.receivedPacketSizeArray);
+
+ if (this.field_120037_e.worldServers != null)
+ {
+ for (int var3 = 0; var3 < this.field_120037_e.worldServers.length; ++var3)
+ {
+ this.field_120036_d[5 + var3] = "Lvl " + var3 + " tick: " + field_120040_a.format(this.func_120035_a(this.field_120037_e.timeOfLastDimensionTick[var3]) * 1.0E-6D) + " ms";
+
+ if (this.field_120037_e.worldServers[var3] != null && this.field_120037_e.worldServers[var3].theChunkProviderServer != null)
+ {
+ this.field_120036_d[5 + var3] = this.field_120036_d[5 + var3] + ", " + this.field_120037_e.worldServers[var3].theChunkProviderServer.makeString();
+ this.field_120036_d[5 + var3] = this.field_120036_d[5 + var3] + ", Vec3: " + this.field_120037_e.worldServers[var3].getWorldVec3Pool().func_82590_d() + " / " + this.field_120037_e.worldServers[var3].getWorldVec3Pool().getPoolSize();
+ }
+ }
+ }
+
+ double var5 = 12500.0D;
+ this.field_120038_b[this.field_120039_c++ & 255] = (int)(this.func_120035_a(this.field_120037_e.sentPacketSizeArray) * 100.0D / 12500.0D);
+ this.repaint();
+ }
+
+ private double func_120035_a(long[] par1ArrayOfLong)
+ {
+ long var2 = 0L;
+
+ for (int var4 = 0; var4 < par1ArrayOfLong.length; ++var4)
+ {
+ var2 += par1ArrayOfLong[var4];
+ }
+
+ return (double)var2 / (double)par1ArrayOfLong.length;
+ }
+
+ private double func_120035_a_int(int[] par1ArrayOfLong)
+ {
+ long var2 = 0L;
+
+ for (int var4 = 0; var4 < par1ArrayOfLong.length; ++var4)
+ {
+ var2 += par1ArrayOfLong[var4];
+ }
+
+ return (double)var2 / (double)par1ArrayOfLong.length;
+ }
+
+ public void paint(Graphics par1Graphics)
+ {
+ par1Graphics.setColor(new Color(16777215));
+ par1Graphics.fillRect(0, 0, 456, 246);
+ int var2;
+
+ for (var2 = 0; var2 < 256; ++var2)
+ {
+ int var3 = this.field_120038_b[var2 + this.field_120039_c & 255];
+ par1Graphics.setColor(new Color(var3 + 28 << 16));
+ par1Graphics.fillRect(var2, 100 - var3, 1, var3);
+ }
+
+ par1Graphics.setColor(Color.BLACK);
+
+ for (var2 = 0; var2 < this.field_120036_d.length; ++var2)
+ {
+ String var4 = this.field_120036_d[var2];
+
+ if (var4 != null)
+ {
+ par1Graphics.drawString(var4, 32, 116 + var2 * 16);
+ }
+ }
+ }
+
+ static void func_120033_a(StatsComponent par0StatsComponent)
+ {
+ par0StatsComponent.func_120034_a();
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/src/StatsComponentINNER1.java Sat Feb 5 04:19:58 2022
***************
*** 0 ****
--- 1,19 ----
+ package net.minecraft.src;
+
+ import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
+
+ class StatsComponentINNER1 implements ActionListener
+ {
+ final StatsComponent field_120030_a;
+
+ StatsComponentINNER1(StatsComponent par1StatsComponent)
+ {
+ this.field_120030_a = par1StatsComponent;
+ }
+
+ public void actionPerformed(ActionEvent par1ActionEvent)
+ {
+ StatsComponent.func_120033_a(this.field_120030_a);
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/src/TextAreaLogHandler.java Sat Feb 5 04:19:58 2022
***************
*** 0 ****
--- 1,40 ----
+ package net.minecraft.src;
+
+ import java.util.logging.Formatter;
+ import java.util.logging.Handler;
+ import java.util.logging.LogRecord;
+ import javax.swing.JTextArea;
+
+ public class TextAreaLogHandler extends Handler
+ {
+ private int[] field_120027_b = new int[1024];
+ private int field_120028_c;
+ Formatter field_120029_a = new TextAreaLogHandlerINNER1(this);
+ private JTextArea field_120026_d;
+
+ public TextAreaLogHandler(JTextArea par1JTextArea)
+ {
+ this.setFormatter(this.field_120029_a);
+ this.field_120026_d = par1JTextArea;
+ }
+
+ public void close() {}
+
+ public void flush() {}
+
+ public void publish(LogRecord par1LogRecord)
+ {
+ int var2 = this.field_120026_d.getDocument().getLength();
+ this.field_120026_d.append(this.field_120029_a.format(par1LogRecord));
+ this.field_120026_d.setCaretPosition(this.field_120026_d.getDocument().getLength());
+ int var3 = this.field_120026_d.getDocument().getLength() - var2;
+
+ if (this.field_120027_b[this.field_120028_c] != 0)
+ {
+ this.field_120026_d.replaceRange("", 0, this.field_120027_b[this.field_120028_c]);
+ }
+
+ this.field_120027_b[this.field_120028_c] = var3;
+ this.field_120028_c = (this.field_120028_c + 1) % 1024;
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/src/TextAreaLogHandlerINNER1.java Sat Feb 5 04:19:58 2022
***************
*** 0 ****
--- 1,34 ----
+ package net.minecraft.src;
+
+ import java.io.PrintWriter;
+ import java.io.StringWriter;
+ import java.util.logging.Formatter;
+ import java.util.logging.LogRecord;
+
+ class TextAreaLogHandlerINNER1 extends Formatter
+ {
+ final TextAreaLogHandler field_120031_a;
+
+ TextAreaLogHandlerINNER1(TextAreaLogHandler par1TextAreaLogHandler)
+ {
+ this.field_120031_a = par1TextAreaLogHandler;
+ }
+
+ public String format(LogRecord par1LogRecord)
+ {
+ StringBuilder var2 = new StringBuilder();
+ var2.append(" [").append(par1LogRecord.getLevel().getName()).append("] ");
+ var2.append(this.formatMessage(par1LogRecord));
+ var2.append('\n');
+ Throwable var3 = par1LogRecord.getThrown();
+
+ if (var3 != null)
+ {
+ StringWriter var4 = new StringWriter();
+ var3.printStackTrace(new PrintWriter(var4));
+ var2.append(var4.toString());
+ }
+
+ return var2.toString();
+ }
+ }
*** /dev/null Thu Jan 1 01:00:00 1970
--- net/minecraft/src/ThreadDedicatedServer.java Sat Feb 5 04:19:58 2022
***************
*** 0 ****
--- 1,16 ----
+ package net.minecraft.src;
+
+ public final class ThreadDedicatedServer extends Thread
+ {
+ final DedicatedServer connectedDedicatedServer;
+
+ public ThreadDedicatedServer(DedicatedServer par1DedicatedServer)
+ {
+ this.connectedDedicatedServer = par1DedicatedServer;
+ }
+
+ public void run()
+ {
+ this.connectedDedicatedServer.stopServer();
+ }
+ }
*** net/minecraft/src/BlockCommandBlock.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/BlockCommandBlock.java Sat Feb 5 05:26:29 2022
***************
*** 49,59 ****
TileEntity var6 = par1World.getBlockTileEntity(par2, par3, par4);
if (var6 != null && var6 instanceof TileEntityCommandBlock)
{
TileEntityCommandBlock var7 = (TileEntityCommandBlock)var6;
! var7.func_96102_a(var7.executeCommandOnPowered(par1World));
par1World.func_96440_m(par2, par3, par4, this.blockID);
}
}
/**
--- 49,59 ----
TileEntity var6 = par1World.getBlockTileEntity(par2, par3, par4);
if (var6 != null && var6 instanceof TileEntityCommandBlock)
{
TileEntityCommandBlock var7 = (TileEntityCommandBlock)var6;
! var7.setSignalStrength(var7.executeCommandOnPowered(par1World));
par1World.func_96440_m(par2, par3, par4, this.blockID);
}
}
/**
***************
*** 93,103 ****
* strength when this block inputs to a comparator.
*/
public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5)
{
TileEntity var6 = par1World.getBlockTileEntity(par2, par3, par4);
! return var6 != null && var6 instanceof TileEntityCommandBlock ? ((TileEntityCommandBlock)var6).func_96103_d() : 0;
}
/**
* Called when the block is placed in the world.
*/
--- 93,103 ----
* strength when this block inputs to a comparator.
*/
public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5)
{
TileEntity var6 = par1World.getBlockTileEntity(par2, par3, par4);
! return var6 != null && var6 instanceof TileEntityCommandBlock ? ((TileEntityCommandBlock)var6).getSignalStrength() : 0;
}
/**
* Called when the block is placed in the world.
*/
*** net/minecraft/src/DedicatedServer.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/DedicatedServer.java Sat Feb 5 05:33:35 2022
***************
*** 356,365 ****
--- 356,374 ----
{
return this.guiIsEnabled;
}
/**
+ * Custom patch to avoid exposing MinecraftServerGui to the client
+ * @param b Whenever or not you want to enable the GUI
+ */
+ public void setGuiEnabled(boolean b)
+ {
+ this.guiIsEnabled = b;
+ }
+
+ /**
* On dedicated does nothing. On integrated, sets commandsAllowedForAll, gameType and allows external connections.
*/
public String shareToLAN(EnumGameType par1EnumGameType, boolean par2)
{
return "";
*** net/minecraft/src/EntityAIAttackOnCollide.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/EntityAIAttackOnCollide.java Sat Feb 5 05:17:28 2022
***************
*** 7,17 ****
/**
* An amount of decrementing ticks that allows the entity to attack once the tick reaches 0.
*/
int attackTick;
! double field_75440_e;
/**
* When true, the mob will continue chasing its target, even if it can't find a path to them right now.
*/
boolean longMemory;
--- 7,19 ----
/**
* An amount of decrementing ticks that allows the entity to attack once the tick reaches 0.
*/
int attackTick;
!
! /** The speed with which the mob will approach the target */
! double speedTowardsTarget;
/**
* When true, the mob will continue chasing its target, even if it can't find a path to them right now.
*/
boolean longMemory;
***************
*** 29,39 ****
public EntityAIAttackOnCollide(EntityCreature par1EntityCreature, double par2, boolean par4)
{
this.attacker = par1EntityCreature;
this.worldObj = par1EntityCreature.worldObj;
! this.field_75440_e = par2;
this.longMemory = par4;
this.setMutexBits(3);
}
/**
--- 31,41 ----
public EntityAIAttackOnCollide(EntityCreature par1EntityCreature, double par2, boolean par4)
{
this.attacker = par1EntityCreature;
this.worldObj = par1EntityCreature.worldObj;
! this.speedTowardsTarget = par2;
this.longMemory = par4;
this.setMutexBits(3);
}
/**
***************
*** 74,84 ****
/**
* Execute a one shot task or start executing a continuous task
*/
public void startExecuting()
{
! this.attacker.getNavigator().setPath(this.entityPathEntity, this.field_75440_e);
this.field_75445_i = 0;
}
/**
* Resets the task
--- 76,86 ----
/**
* Execute a one shot task or start executing a continuous task
*/
public void startExecuting()
{
! this.attacker.getNavigator().setPath(this.entityPathEntity, this.speedTowardsTarget);
this.field_75445_i = 0;
}
/**
* Resets the task
***************
*** 97,107 ****
this.attacker.getLookHelper().setLookPositionWithEntity(var1, 30.0F, 30.0F);
if ((this.longMemory || this.attacker.getEntitySenses().canSee(var1)) && --this.field_75445_i <= 0)
{
this.field_75445_i = 4 + this.attacker.getRNG().nextInt(7);
! this.attacker.getNavigator().tryMoveToEntityLiving(var1, this.field_75440_e);
}
this.attackTick = Math.max(this.attackTick - 1, 0);
double var2 = (double)(this.attacker.width * 2.0F * this.attacker.width * 2.0F + var1.width);
--- 99,109 ----
this.attacker.getLookHelper().setLookPositionWithEntity(var1, 30.0F, 30.0F);
if ((this.longMemory || this.attacker.getEntitySenses().canSee(var1)) && --this.field_75445_i <= 0)
{
this.field_75445_i = 4 + this.attacker.getRNG().nextInt(7);
! this.attacker.getNavigator().tryMoveToEntityLiving(var1, this.speedTowardsTarget);
}
this.attackTick = Math.max(this.attackTick - 1, 0);
double var2 = (double)(this.attacker.width * 2.0F * this.attacker.width * 2.0F + var1.width);
*** net/minecraft/src/ILogAgent.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/ILogAgent.java Sat Feb 5 05:18:28 2022
***************
*** 1,11 ****
--- 1,21 ----
package net.minecraft.src;
+ import java.util.logging.Logger;
+
public interface ILogAgent
{
+ Logger getServerLogger();
+
+ /**
+ * Logs plain text message.
+ */
void logInfo(String var1);
+ /**
+ * Logs text as warning.
+ */
void logWarning(String var1);
void logWarningFormatted(String var1, Object ... var2);
void logWarningException(String var1, Throwable var2);
*** net/minecraft/src/LogAgent.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/LogAgent.java Sat Feb 5 05:18:30 2022
***************
*** 52,66 ****
--- 52,77 ----
{
this.serverLogger.log(Level.WARNING, "Failed to log " + this.loggerName + " to " + this.logFile, var5);
}
}
+ public Logger getServerLogger()
+ {
+ return this.serverLogger;
+ }
+
+ /**
+ * Logs plain text message.
+ */
public void logInfo(String par1Str)
{
this.serverLogger.log(Level.INFO, par1Str);
}
+ /**
+ * Logs text as warning.
+ */
public void logWarning(String par1Str)
{
this.serverLogger.log(Level.WARNING, par1Str);
}
*** net/minecraft/src/Minecraft.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/Minecraft.java Sat Feb 5 05:50:37 2022
***************
*** 31,41 ****
import org.lwjgl.opengl.PixelFormat;
import org.lwjgl.util.glu.GLU;
public class Minecraft implements IPlayerUsage
{
! private static final String WINDOW_TITLE = "TheMasterCaver\'s World (version 5)";
public static final String VERSION = "TMCWv5";
public static final String VERSION_ID_STRING = "DEC5";
private CustomKeyHelper customKeyHelper;
private static int MAX_TEXTURE_SIZE;
private long lastAttackTime;
--- 31,41 ----
import org.lwjgl.opengl.PixelFormat;
import org.lwjgl.util.glu.GLU;
public class Minecraft implements IPlayerUsage
{
! public static final String WINDOW_TITLE = "TheMasterCaver\'s World (version 5)";
public static final String VERSION = "TMCWv5";
public static final String VERSION_ID_STRING = "DEC5";
private CustomKeyHelper customKeyHelper;
private static int MAX_TEXTURE_SIZE;
private long lastAttackTime;
*** net/minecraft/src/NetClientHandler.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/NetClientHandler.java Sat Feb 5 05:25:09 2022
***************
*** 1673,1694 ****
Scoreboard var2 = this.worldClient.getScoreboard();
ScorePlayerTeam var3;
if (par1Packet209SetPlayerTeam.mode == 0)
{
! var3 = var2.func_96527_f(par1Packet209SetPlayerTeam.teamName);
}
else
{
var3 = var2.func_96508_e(par1Packet209SetPlayerTeam.teamName);
}
if (par1Packet209SetPlayerTeam.mode == 0 || par1Packet209SetPlayerTeam.mode == 2)
{
! var3.func_96664_a(par1Packet209SetPlayerTeam.teamDisplayName);
! var3.func_96666_b(par1Packet209SetPlayerTeam.teamPrefix);
! var3.func_96662_c(par1Packet209SetPlayerTeam.teamSuffix);
var3.func_98298_a(par1Packet209SetPlayerTeam.friendlyFire);
}
Iterator var4;
String var5;
--- 1673,1694 ----
Scoreboard var2 = this.worldClient.getScoreboard();
ScorePlayerTeam var3;
if (par1Packet209SetPlayerTeam.mode == 0)
{
! var3 = var2.createTeam(par1Packet209SetPlayerTeam.teamName);
}
else
{
var3 = var2.func_96508_e(par1Packet209SetPlayerTeam.teamName);
}
if (par1Packet209SetPlayerTeam.mode == 0 || par1Packet209SetPlayerTeam.mode == 2)
{
! var3.setTeamName(par1Packet209SetPlayerTeam.teamDisplayName);
! var3.setNamePrefix(par1Packet209SetPlayerTeam.teamPrefix);
! var3.setNameSuffix(par1Packet209SetPlayerTeam.teamSuffix);
var3.func_98298_a(par1Packet209SetPlayerTeam.friendlyFire);
}
Iterator var4;
String var5;
***************
*** 1698,1708 ****
var4 = par1Packet209SetPlayerTeam.playerNames.iterator();
while (var4.hasNext())
{
var5 = (String)var4.next();
! var2.func_96521_a(var5, var3);
}
}
if (par1Packet209SetPlayerTeam.mode == 4)
{
--- 1698,1708 ----
var4 = par1Packet209SetPlayerTeam.playerNames.iterator();
while (var4.hasNext())
{
var5 = (String)var4.next();
! var2.addPlayerToTeam(var5, var3);
}
}
if (par1Packet209SetPlayerTeam.mode == 4)
{
*** net/minecraft/src/PathNavigate.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/PathNavigate.java Sat Feb 5 05:23:04 2022
***************
*** 105,125 ****
public void setCanSwim(boolean par1)
{
this.canSwim = par1;
}
! public float func_111269_d()
{
return (float)this.pathSearchRange.getAttributeValue();
}
/**
* Returns the path to the given coordinates
*/
public PathEntity getPathToXYZ(double par1, double par3, double par5)
{
! return !this.canNavigate() ? null : this.worldObj.getEntityPathToXYZ(this.theEntity, MathHelper.floor_double(par1), (int)par3, MathHelper.floor_double(par5), this.func_111269_d(), this.canPassOpenWoodenDoors, this.canPassClosedWoodenDoors, this.avoidsWater, this.canSwim);
}
/**
* Try to find and set a path to XYZ. Returns true if successful.
*/
--- 105,128 ----
public void setCanSwim(boolean par1)
{
this.canSwim = par1;
}
! /**
! * Gets the maximum distance that the path finding will search in.
! */
! public float getPathSearchRange()
{
return (float)this.pathSearchRange.getAttributeValue();
}
/**
* Returns the path to the given coordinates
*/
public PathEntity getPathToXYZ(double par1, double par3, double par5)
{
! return !this.canNavigate() ? null : this.worldObj.getEntityPathToXYZ(this.theEntity, MathHelper.floor_double(par1), (int)par3, MathHelper.floor_double(par5), this.getPathSearchRange(), this.canPassOpenWoodenDoors, this.canPassClosedWoodenDoors, this.avoidsWater, this.canSwim);
}
/**
* Try to find and set a path to XYZ. Returns true if successful.
*/
***************
*** 132,142 ****
/**
* Returns the path to the given EntityLiving
*/
public PathEntity getPathToEntityLiving(Entity par1Entity)
{
! return !this.canNavigate() ? null : this.worldObj.getPathEntityToEntity(this.theEntity, par1Entity, this.func_111269_d(), this.canPassOpenWoodenDoors, this.canPassClosedWoodenDoors, this.avoidsWater, this.canSwim);
}
/**
* Try to find and set a path to EntityLiving. Returns true if successful.
*/
--- 135,145 ----
/**
* Returns the path to the given EntityLiving
*/
public PathEntity getPathToEntityLiving(Entity par1Entity)
{
! return !this.canNavigate() ? null : this.worldObj.getPathEntityToEntity(this.theEntity, par1Entity, this.getPathSearchRange(), this.canPassOpenWoodenDoors, this.canPassClosedWoodenDoors, this.avoidsWater, this.canSwim);
}
/**
* Try to find and set a path to EntityLiving. Returns true if successful.
*/
*** net/minecraft/src/Scoreboard.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/Scoreboard.java Sat Feb 5 05:21:53 2022
***************
*** 191,201 ****
public ScorePlayerTeam func_96508_e(String par1Str)
{
return (ScorePlayerTeam)this.field_96542_e.get(par1Str);
}
! public ScorePlayerTeam func_96527_f(String par1Str)
{
ScorePlayerTeam var2 = this.func_96508_e(par1Str);
if (var2 != null)
{
--- 191,201 ----
public ScorePlayerTeam func_96508_e(String par1Str)
{
return (ScorePlayerTeam)this.field_96542_e.get(par1Str);
}
! public ScorePlayerTeam createTeam(String par1Str)
{
ScorePlayerTeam var2 = this.func_96508_e(par1Str);
if (var2 != null)
{
***************
*** 222,243 ****
}
this.func_96513_c(par1ScorePlayerTeam);
}
! public void func_96521_a(String par1Str, ScorePlayerTeam par2ScorePlayerTeam)
{
if (this.getPlayersTeam(par1Str) != null)
{
! this.func_96524_g(par1Str);
}
this.teamMemberships.put(par1Str, par2ScorePlayerTeam);
par2ScorePlayerTeam.getMembershipCollection().add(par1Str);
}
! public boolean func_96524_g(String par1Str)
{
ScorePlayerTeam var2 = this.getPlayersTeam(par1Str);
if (var2 != null)
{
--- 222,243 ----
}
this.func_96513_c(par1ScorePlayerTeam);
}
! public void addPlayerToTeam(String par1Str, ScorePlayerTeam par2ScorePlayerTeam)
{
if (this.getPlayersTeam(par1Str) != null)
{
! this.removePlayerFromTeams(par1Str);
}
this.teamMemberships.put(par1Str, par2ScorePlayerTeam);
par2ScorePlayerTeam.getMembershipCollection().add(par1Str);
}
! public boolean removePlayerFromTeams(String par1Str)
{
ScorePlayerTeam var2 = this.getPlayersTeam(par1Str);
if (var2 != null)
{
*** net/minecraft/src/ScoreboardSaveData.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/ScoreboardSaveData.java Sat Feb 5 05:25:45 2022
***************
*** 58,91 ****
protected void func_96498_a(NBTTagList par1NBTTagList)
{
for (int var2 = 0; var2 < par1NBTTagList.tagCount(); ++var2)
{
NBTTagCompound var3 = (NBTTagCompound)par1NBTTagList.tagAt(var2);
! ScorePlayerTeam var4 = this.theScoreboard.func_96527_f(var3.getString("Name"));
! var4.func_96664_a(var3.getString("DisplayName"));
! var4.func_96666_b(var3.getString("Prefix"));
! var4.func_96662_c(var3.getString("Suffix"));
if (var3.hasKey("AllowFriendlyFire"))
{
var4.setAllowFriendlyFire(var3.getBoolean("AllowFriendlyFire"));
}
if (var3.hasKey("SeeFriendlyInvisibles"))
{
! var4.func_98300_b(var3.getBoolean("SeeFriendlyInvisibles"));
}
this.func_96502_a(var4, var3.getTagList("Players"));
}
}
protected void func_96502_a(ScorePlayerTeam par1ScorePlayerTeam, NBTTagList par2NBTTagList)
{
for (int var3 = 0; var3 < par2NBTTagList.tagCount(); ++var3)
{
! this.theScoreboard.func_96521_a(((NBTTagString)par2NBTTagList.tagAt(var3)).data, par1ScorePlayerTeam);
}
}
protected void func_96504_c(NBTTagCompound par1NBTTagCompound)
{
--- 58,91 ----
protected void func_96498_a(NBTTagList par1NBTTagList)
{
for (int var2 = 0; var2 < par1NBTTagList.tagCount(); ++var2)
{
NBTTagCompound var3 = (NBTTagCompound)par1NBTTagList.tagAt(var2);
! ScorePlayerTeam var4 = this.theScoreboard.createTeam(var3.getString("Name"));
! var4.setTeamName(var3.getString("DisplayName"));
! var4.setNamePrefix(var3.getString("Prefix"));
! var4.setNameSuffix(var3.getString("Suffix"));
if (var3.hasKey("AllowFriendlyFire"))
{
var4.setAllowFriendlyFire(var3.getBoolean("AllowFriendlyFire"));
}
if (var3.hasKey("SeeFriendlyInvisibles"))
{
! var4.setSeeFriendlyInvisiblesEnabled(var3.getBoolean("SeeFriendlyInvisibles"));
}
this.func_96502_a(var4, var3.getTagList("Players"));
}
}
protected void func_96502_a(ScorePlayerTeam par1ScorePlayerTeam, NBTTagList par2NBTTagList)
{
for (int var3 = 0; var3 < par2NBTTagList.tagCount(); ++var3)
{
! this.theScoreboard.addPlayerToTeam(((NBTTagString)par2NBTTagList.tagAt(var3)).data, par1ScorePlayerTeam);
}
}
protected void func_96504_c(NBTTagCompound par1NBTTagCompound)
{
*** net/minecraft/src/ScorePlayerTeam.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/ScorePlayerTeam.java Sat Feb 5 05:22:18 2022
***************
*** 32,42 ****
public String func_96669_c()
{
return this.field_96673_d;
}
! public void func_96664_a(String par1Str)
{
if (par1Str == null)
{
throw new IllegalArgumentException("Name cannot be null");
}
--- 32,42 ----
public String func_96669_c()
{
return this.field_96673_d;
}
! public void setTeamName(String par1Str)
{
if (par1Str == null)
{
throw new IllegalArgumentException("Name cannot be null");
}
***************
*** 58,68 ****
public String getColorPrefix()
{
return this.field_96674_e;
}
! public void func_96666_b(String par1Str)
{
if (par1Str == null)
{
throw new IllegalArgumentException("Prefix cannot be null");
}
--- 58,68 ----
public String getColorPrefix()
{
return this.field_96674_e;
}
! public void setNamePrefix(String par1Str)
{
if (par1Str == null)
{
throw new IllegalArgumentException("Prefix cannot be null");
}
***************
*** 79,89 ****
public String getColorSuffix()
{
return this.colorSuffix;
}
! public void func_96662_c(String par1Str)
{
if (par1Str == null)
{
throw new IllegalArgumentException("Suffix cannot be null");
}
--- 79,89 ----
public String getColorSuffix()
{
return this.colorSuffix;
}
! public void setNameSuffix(String par1Str)
{
if (par1Str == null)
{
throw new IllegalArgumentException("Suffix cannot be null");
}
***************
*** 121,131 ****
public boolean func_98297_h()
{
return this.field_98301_h;
}
! public void func_98300_b(boolean par1)
{
this.field_98301_h = par1;
this.theScoreboard.func_96538_b(this);
}
--- 121,131 ----
public boolean func_98297_h()
{
return this.field_98301_h;
}
! public void setSeeFriendlyInvisiblesEnabled(boolean par1)
{
this.field_98301_h = par1;
this.theScoreboard.func_96538_b(this);
}
***************
*** 147,154 ****
}
public void func_98298_a(int par1)
{
this.setAllowFriendlyFire((par1 & 1) > 0);
! this.func_98300_b((par1 & 2) > 0);
}
}
--- 147,154 ----
}
public void func_98298_a(int par1)
{
this.setAllowFriendlyFire((par1 & 1) > 0);
! this.setSeeFriendlyInvisiblesEnabled((par1 & 2) > 0);
}
}
*** net/minecraft/src/ServerCommandScoreboard.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/ServerCommandScoreboard.java Sat Feb 5 05:20:47 2022
***************
*** 358,377 ****
throw new SyntaxErrorException("commands.scoreboard.teams.add.displayTooLong", new Object[] {var6, Integer.valueOf(32)});
}
if (var6.length() > 0)
{
! var5.func_96527_f(var4).func_96664_a(var6);
}
else
{
! var5.func_96527_f(var4);
}
}
else
{
! var5.func_96527_f(var4);
}
notifyAdmins(par1ICommandSender, "commands.scoreboard.teams.add.success", new Object[] {var4});
}
}
--- 358,377 ----
throw new SyntaxErrorException("commands.scoreboard.teams.add.displayTooLong", new Object[] {var6, Integer.valueOf(32)});
}
if (var6.length() > 0)
{
! var5.createTeam(var4).setTeamName(var6);
}
else
{
! var5.createTeam(var4);
}
}
else
{
! var5.createTeam(var4);
}
notifyAdmins(par1ICommandSender, "commands.scoreboard.teams.add.success", new Object[] {var4});
}
}
***************
*** 414,425 ****
if (var6 == null)
{
throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] {var5, func_96333_a(EnumChatFormatting.func_96296_a(true, false))});
}
! var4.func_96666_b(var7.toString());
! var4.func_96662_c(EnumChatFormatting.RESET.toString());
}
else if (var5.equalsIgnoreCase("friendlyfire"))
{
if (!var6.equalsIgnoreCase("true") && !var6.equalsIgnoreCase("false"))
{
--- 414,425 ----
if (var6 == null)
{
throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] {var5, func_96333_a(EnumChatFormatting.func_96296_a(true, false))});
}
! var4.setNamePrefix(var7.toString());
! var4.setNameSuffix(EnumChatFormatting.RESET.toString());
}
else if (var5.equalsIgnoreCase("friendlyfire"))
{
if (!var6.equalsIgnoreCase("true") && !var6.equalsIgnoreCase("false"))
{
***************
*** 433,443 ****
if (!var6.equalsIgnoreCase("true") && !var6.equalsIgnoreCase("false"))
{
throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] {var5, func_96333_a(Arrays.asList(new String[]{"true", "false"}))});
}
! var4.func_98300_b(var6.equalsIgnoreCase("true"));
}
notifyAdmins(par1ICommandSender, "commands.scoreboard.teams.option.success", new Object[] {var5, var4.func_96661_b(), var6});
}
}
--- 433,443 ----
if (!var6.equalsIgnoreCase("true") && !var6.equalsIgnoreCase("false"))
{
throw new WrongUsageException("commands.scoreboard.teams.option.noValue", new Object[] {var5, func_96333_a(Arrays.asList(new String[]{"true", "false"}))});
}
! var4.setSeeFriendlyInvisiblesEnabled(var6.equalsIgnoreCase("true"));
}
notifyAdmins(par1ICommandSender, "commands.scoreboard.teams.option.success", new Object[] {var5, var4.func_96661_b(), var6});
}
}
***************
*** 504,522 ****
String var7;
if (par1ICommandSender instanceof EntityPlayer && par3 == par2ArrayOfStr.length)
{
var7 = getCommandSenderAsPlayer(par1ICommandSender).getEntityName();
! var4.func_96521_a(var7, var5);
var6.add(var7);
}
else
{
while (par3 < par2ArrayOfStr.length)
{
var7 = func_96332_d(par1ICommandSender, par2ArrayOfStr[par3++]);
! var4.func_96521_a(var7, var5);
var6.add(var7);
}
}
if (!var6.isEmpty())
--- 504,522 ----
String var7;
if (par1ICommandSender instanceof EntityPlayer && par3 == par2ArrayOfStr.length)
{
var7 = getCommandSenderAsPlayer(par1ICommandSender).getEntityName();
! var4.addPlayerToTeam(var7, var5);
var6.add(var7);
}
else
{
while (par3 < par2ArrayOfStr.length)
{
var7 = func_96332_d(par1ICommandSender, par2ArrayOfStr[par3++]);
! var4.addPlayerToTeam(var7, var5);
var6.add(var7);
}
}
if (!var6.isEmpty())
***************
*** 537,547 ****
if (par1ICommandSender instanceof EntityPlayer && par3 == par2ArrayOfStr.length)
{
var7 = getCommandSenderAsPlayer(par1ICommandSender).getEntityName();
! if (var4.func_96524_g(var7))
{
var5.add(var7);
}
else
{
--- 537,547 ----
if (par1ICommandSender instanceof EntityPlayer && par3 == par2ArrayOfStr.length)
{
var7 = getCommandSenderAsPlayer(par1ICommandSender).getEntityName();
! if (var4.removePlayerFromTeams(var7))
{
var5.add(var7);
}
else
{
***************
*** 552,562 ****
{
while (par3 < par2ArrayOfStr.length)
{
var7 = func_96332_d(par1ICommandSender, par2ArrayOfStr[par3++]);
! if (var4.func_96524_g(var7))
{
var5.add(var7);
}
else
{
--- 552,562 ----
{
while (par3 < par2ArrayOfStr.length)
{
var7 = func_96332_d(par1ICommandSender, par2ArrayOfStr[par3++]);
! if (var4.removePlayerFromTeams(var7))
{
var5.add(var7);
}
else
{
*** net/minecraft/src/ServerScoreboard.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/ServerScoreboard.java Sat Feb 5 05:19:39 2022
***************
*** 68,80 ****
}
this.func_96551_b();
}
! public void func_96521_a(String par1Str, ScorePlayerTeam par2ScorePlayerTeam)
{
! super.func_96521_a(par1Str, par2ScorePlayerTeam);
this.field_96555_a.getConfigurationManager().sendPacketToAllPlayers(new Packet209SetPlayerTeam(par2ScorePlayerTeam, Arrays.asList(new String[] {par1Str}), 3));
this.func_96551_b();
}
/**
--- 68,80 ----
}
this.func_96551_b();
}
! public void addPlayerToTeam(String par1Str, ScorePlayerTeam par2ScorePlayerTeam)
{
! super.addPlayerToTeam(par1Str, par2ScorePlayerTeam);
this.field_96555_a.getConfigurationManager().sendPacketToAllPlayers(new Packet209SetPlayerTeam(par2ScorePlayerTeam, Arrays.asList(new String[] {par1Str}), 3));
this.func_96551_b();
}
/**
*** net/minecraft/src/TileEntityCommandBlock.java Fri Feb 4 19:29:58 2022
--- net/minecraft/src/TileEntityCommandBlock.java Sat Feb 5 05:19:20 2022
***************
*** 127,141 ****
NBTTagCompound var1 = new NBTTagCompound();
this.writeToNBT(var1);
return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, 2, var1);
}
! public int func_96103_d()
{
return this.succesCount;
}
! public void func_96102_a(int par1)
{
this.succesCount = par1;
}
}
--- 127,141 ----
NBTTagCompound var1 = new NBTTagCompound();
this.writeToNBT(var1);
return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, 2, var1);
}
! public int getSignalStrength()
{
return this.succesCount;
}
! public void setSignalStrength(int par1)
{
this.succesCount = par1;
}
}
Reference in New Issue View Git Blame Copy Permalink