resolve conflicts

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java

@@ -17,15 +17,16 @@
 
 package com.comphenix.protocol.utility;
 
-import com.comphenix.protocol.ProtocolLibrary;
-import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.Ordering;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import com.comphenix.protocol.ProtocolLibrary;
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Ordering;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 

src/main/java/com/comphenix/protocol/wrappers/Converters.java

@@ -1,18 +1,16 @@
 /**
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
+ * ProtocolLib - Bukkit server library that allows access to the Minecraft protocol. Copyright (C) 2017 Dan Mulloy
- *  Copyright (C) 2017 Dan Mulloy
+ * <p>
- *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
- *  This program is free software; you can redistribute it and/or modify it under the terms of the
+ * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of
+ * version.
- *  the License, or (at your option) any later version.
+ * <p>
- *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * details.
- *  See the GNU General Public License for more details.
+ * <p>
- *
+ * You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
- *  You should have received a copy of the GNU General Public License along with this program;
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307 USA
  */
 package com.comphenix.protocol.wrappers;
 

src/test/java/com/comphenix/protocol/BukkitInitialization.java

@@ -1,13 +1,11 @@
 package com.comphenix.protocol;
 
-import static org.mockito.Mockito.mock;
+import java.util.Collections;
-import static org.mockito.Mockito.when;
+import java.util.List;
 
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.utility.MinecraftReflectionTestUtil;
-import java.util.Collections;
-import java.util.List;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.IRegistry;
 import net.minecraft.server.DispenserRegistry;
@@ -22,6 +20,9 @@ import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemFactory;
 import org.bukkit.craftbukkit.v1_19_R2.util.Versioning;
 import org.spigotmc.SpigotWorldConfig;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 /**
  * Used to ensure that ProtocolLib and Bukkit is prepared to be tested.
  *

src/test/java/com/comphenix/protocol/events/PacketContainerTest.java

@@ -43,7 +43,6 @@ import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.BlockPosition;
 import com.comphenix.protocol.wrappers.BukkitConverters;
 import com.comphenix.protocol.wrappers.ComponentConverter;
-import com.comphenix.protocol.wrappers.Either;
 import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
 import com.comphenix.protocol.wrappers.EnumWrappers.EntityUseAction;
@@ -58,12 +57,9 @@ import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedDataValue;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
-import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
 import com.comphenix.protocol.wrappers.WrappedEnumEntityUseAction;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedRegistry;
-import com.comphenix.protocol.wrappers.WrappedSaltedSignature;
-import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 import com.google.common.collect.Lists;
@@ -107,7 +103,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;

src/test/java/com/comphenix/protocol/injector/EntityUtilitiesTest.java

@@ -1,15 +1,12 @@
 package com.comphenix.protocol.injector;
 
-import static com.comphenix.protocol.utility.TestUtils.setFinalField;
+import java.lang.reflect.Field;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.lang.reflect.Field;
 import net.minecraft.server.level.ChunkProviderServer;
 import net.minecraft.server.level.PlayerChunkMap;
 import net.minecraft.server.level.PlayerChunkMap.EntityTracker;
@@ -20,6 +17,10 @@ import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static com.comphenix.protocol.utility.TestUtils.setFinalField;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class EntityUtilitiesTest {
 
 	@BeforeAll

src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java

@@ -1,14 +1,5 @@
 package com.comphenix.protocol.utility;
 
-import static com.comphenix.protocol.utility.TestUtils.assertItemsEqual;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
 import com.comphenix.protocol.BukkitInitialization;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.nbt.NBTCompressedStreamTools;
@@ -29,6 +20,15 @@ import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static com.comphenix.protocol.utility.TestUtils.assertItemsEqual;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 public class MinecraftReflectionTest {
 
 	@BeforeAll
@@ -132,7 +132,8 @@ public class MinecraftReflectionTest {
 		assertItemsEqual(stack, MinecraftReflection.getBukkitItemStack(nmsStack));
 
 		// The NMS handle for CraftItemStack is null with Material.AIR, make sure it is handled correctly
-		assertNotNull(MinecraftReflection.getMinecraftItemStack(CraftItemStack.asCraftCopy(new ItemStack(Material.AIR))));
+		assertNotNull(
+				MinecraftReflection.getMinecraftItemStack(CraftItemStack.asCraftCopy(new ItemStack(Material.AIR))));
 	}
 
 	@Test

src/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java

@@ -1,18 +1,19 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Map;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.Map.Entry;
-import static org.junit.jupiter.api.Assertions.fail;
+import java.util.Set;
 
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.google.common.collect.Sets;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class EnumWrappersTest {
 
 	private static final Set<String> KNOWN_INVALID = Sets.newHashSet(

src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java

@@ -1,17 +1,13 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.ArrayList;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
+import java.util.List;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.WrappedAttributeModifier.Operation;
 import com.google.common.collect.Lists;
-
-import java.util.ArrayList;
-import java.util.List;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.protocol.game.PacketPlayOutUpdateAttributes.AttributeSnapshot;
 import net.minecraft.resources.MinecraftKey;
@@ -21,6 +17,10 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class WrappedAttributeTest {
 
 	private WrappedAttributeModifier doubleModifier;

src/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java

@@ -14,8 +14,6 @@
  */
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import com.comphenix.protocol.BukkitInitialization;
 import net.minecraft.world.level.block.state.IBlockData;
 import org.bukkit.Material;
@@ -27,6 +25,8 @@ import org.bukkit.craftbukkit.v1_19_R2.util.CraftMagicNumbers;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * @author dmulloy2
  */

src/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java

@@ -14,23 +14,24 @@
  */
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.UUID;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
-import java.util.UUID;
 import net.minecraft.world.entity.projectile.EntityEgg;
 import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEgg;
 import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * @author dmulloy2
  */