Merge branch 'mc-1.15.x' into mc-1.16.x

2025-11-24 00:54:48 +00:00 · 2021-01-06 22:39:54 +00:00
parent 4af5bcc0b0 cc5e972cfc
commit 1edb7288b9
454 changed files with 551 additions and 556 deletions
--- a/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
+++ b/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network;
--- a/src/main/java/dan200/computercraft/shared/network/NetworkMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/NetworkMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network;
--- a/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.client;
--- a/src/main/java/dan200/computercraft/shared/network/client/ComputerClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerClientMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.client;
--- a/src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.client;
--- a/src/main/java/dan200/computercraft/shared/network/client/ComputerDeletedClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerDeletedClientMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.client;
--- a/src/main/java/dan200/computercraft/shared/network/client/ComputerTerminalClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerTerminalClientMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.client;
--- a/src/main/java/dan200/computercraft/shared/network/client/MonitorClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/MonitorClientMessage.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.shared.network.client;

 import dan200.computercraft.shared.network.NetworkMessage;
--- a/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.client;
--- a/src/main/java/dan200/computercraft/shared/network/client/TerminalState.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/TerminalState.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.shared.network.client;

 import dan200.computercraft.core.terminal.Terminal;
--- a/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ComputerContainerData.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.container;
--- a/src/main/java/dan200/computercraft/shared/network/container/ContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ContainerData.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.container;
--- a/src/main/java/dan200/computercraft/shared/network/container/HeldItemContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/HeldItemContainerData.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.container;
--- a/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.container;
--- a/src/main/java/dan200/computercraft/shared/network/server/ComputerActionServerMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/ComputerActionServerMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.server;
--- a/src/main/java/dan200/computercraft/shared/network/server/ComputerServerMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/ComputerServerMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.server;
--- a/src/main/java/dan200/computercraft/shared/network/server/KeyEventServerMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/KeyEventServerMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.server;
--- a/src/main/java/dan200/computercraft/shared/network/server/MouseEventServerMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/MouseEventServerMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.server;
--- a/src/main/java/dan200/computercraft/shared/network/server/QueueEventServerMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/QueueEventServerMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.server;
--- a/src/main/java/dan200/computercraft/shared/network/server/RequestComputerMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/RequestComputerMessage.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.shared.network.server;