From 265cc1a666f194adbc3605dd44ed928275db584c Mon Sep 17 00:00:00 2001
From: Aleksey <bulldog.seregin@gmail.com>
Date: Thu, 22 Apr 2021 09:50:32 +0300
Subject: [PATCH] A liitle bit refactor

---
 src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java | 4 +---
 src/main/java/ru/betterend/util/TagHelper.java              | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java b/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java
index 1b627124..aabf889a 100644
--- a/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java
@@ -30,8 +30,6 @@ public class TagLoaderMixin {
 	@ModifyArg(method = "prepare", at = @At(value = "INVOKE",
 			target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
 	public Supplier<Map<ResourceLocation, Tag.Builder>> be_modifyTags(Supplier<Map<ResourceLocation, Tag.Builder>> supplier, Executor executor) {
-		Map<ResourceLocation, Tag.Builder> map = supplier.get();
-		TagHelper.apply(name, map);
-		return () -> map;
+		return () -> TagHelper.apply(name, supplier.get());
 	}
 }
diff --git a/src/main/java/ru/betterend/util/TagHelper.java b/src/main/java/ru/betterend/util/TagHelper.java
index 0f44152b..bef0ffb7 100644
--- a/src/main/java/ru/betterend/util/TagHelper.java
+++ b/src/main/java/ru/betterend/util/TagHelper.java
@@ -58,7 +58,7 @@ public class TagHelper {
 		return builder;
 	}
 	
-	public static void apply(String entry, Map<ResourceLocation, Tag.Builder> tagsMap) {
+	public static Map<ResourceLocation, Tag.Builder> apply(String entry, Map<ResourceLocation, Tag.Builder> tagsMap) {
 		Map<ResourceLocation, Set<ResourceLocation>> endTags = null;
 		if (entry.equals("block")) {
 			endTags = TAGS_BLOCK;
@@ -68,5 +68,6 @@ public class TagHelper {
 		if (endTags != null) {
 			endTags.forEach((id, ids) -> apply(tagsMap.computeIfAbsent(id, key -> Tag.Builder.tag()), ids));
 		}
+		return tagsMap;
 	}
 }