From a2acd5065830787f38606eac86d57483b5b5125d Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Fri, 18 Mar 2022 14:44:39 +0100
Subject: [PATCH] Some cleanup

---
 .../bclib/api/dataexchange/DataHandler.java   | 20 ++-----------------
 .../handler/autosync/SendFiles.java           |  1 -
 src/main/java/ru/bclib/api/tag/TagAPI.java    |  1 -
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ru/bclib/api/dataexchange/DataHandler.java b/src/main/java/ru/bclib/api/dataexchange/DataHandler.java
index 9f47278c..30492bed 100644
--- a/src/main/java/ru/bclib/api/dataexchange/DataHandler.java
+++ b/src/main/java/ru/bclib/api/dataexchange/DataHandler.java
@@ -147,24 +147,8 @@ public abstract class DataHandler extends BaseDataHandler {
 		@Environment(EnvType.CLIENT)
 		abstract protected void serializeDataOnClient(FriendlyByteBuf buf);
 
-		@Deprecated(forRemoval = true)
-		protected void deserializeIncomingDataOnServer(FriendlyByteBuf buf, PacketSender responseSender){ }
-
-		//TODO: should be abstract once deserializeIncomingDataOnServer(FriendlyByteBuf buf, PacketSender responseSender) was removed
-
-		protected void deserializeIncomingDataOnServer(FriendlyByteBuf buf, Player player, PacketSender responseSender) {
-			deserializeIncomingDataOnServer(buf, responseSender);
-		}
-
-		@Deprecated(forRemoval = true)
-		protected void runOnServerGameThread(MinecraftServer server){ }
-
-
-		//TODO: should be abstract once   runOnServerGameThread(MinecraftServer server) was  removed
-		protected void runOnServerGameThread(MinecraftServer server, Player player){
-			runOnServerGameThread(server);
-		}
-		
+		protected abstract void deserializeIncomingDataOnServer(FriendlyByteBuf buf, Player player, PacketSender responseSender);
+		protected abstract void runOnServerGameThread(MinecraftServer server, Player player);
 		
 		@Environment(EnvType.CLIENT)
 		@Override
diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java
index ef52b214..cd1e21de 100644
--- a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java
+++ b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/SendFiles.java
@@ -127,7 +127,6 @@ public class SendFiles extends DataHandler.FromServer {
 		if ( Configs.CLIENT_CONFIG.isAcceptingConfigs() ||  Configs.CLIENT_CONFIG.isAcceptingFiles() ||  Configs.CLIENT_CONFIG.isAcceptingMods()) {
 			BCLib.LOGGER.info("Writing Files:");
 			
-			//TODO: Reject files that were not in the last RequestFiles.
 			for (Pair<AutoFileSyncEntry, byte[]> entry : receivedFiles) {
 				final AutoFileSyncEntry e = entry.first;
 				final byte[] data = entry.second;
diff --git a/src/main/java/ru/bclib/api/tag/TagAPI.java b/src/main/java/ru/bclib/api/tag/TagAPI.java
index 557cac7e..98d08a9f 100644
--- a/src/main/java/ru/bclib/api/tag/TagAPI.java
+++ b/src/main/java/ru/bclib/api/tag/TagAPI.java
@@ -35,7 +35,6 @@ public class TagAPI {
 	 * @return {@link TagKey}.
 	 */
 	public static <T> TagKey<T> makeTag(Registry<T> registry, TagLocation<T> id) {
-		//TODO: 1.18.2 check if registry.key() gets the correct result
 		return registry
 				.getTagNames()
 				.filter(tagKey -> tagKey.location().equals(id))