MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A liitle bit refactor

Browse source
This commit is contained in:
Aleksey 2021-04-22 09:50:32 +03:00
parent bc07b34f1c
commit 265cc1a666
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/betterend/mixin/common/TagLoaderMixin.java
View file

@ -30,8 +30,6 @@ public class TagLoaderMixin {
@ModifyArg(method = "prepare", at = @At(value = "INVOKE", @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;")) 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) { public Supplier<Map<ResourceLocation, Tag.Builder>> be_modifyTags(Supplier<Map<ResourceLocation, Tag.Builder>> supplier, Executor executor) {
Map<ResourceLocation, Tag.Builder> map = supplier.get(); return () -> TagHelper.apply(name, supplier.get());
TagHelper.apply(name, map);
return () -> map;
} }
} }

3
src/main/java/ru/betterend/util/TagHelper.java
View file

@ -58,7 +58,7 @@ public class TagHelper {
return builder; 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; Map<ResourceLocation, Set<ResourceLocation>> endTags = null;
if (entry.equals("block")) { if (entry.equals("block")) {
endTags = TAGS_BLOCK; endTags = TAGS_BLOCK;
@ -68,5 +68,6 @@ public class TagHelper {
if (endTags != null) { if (endTags != null) {
endTags.forEach((id, ids) -> apply(tagsMap.computeIfAbsent(id, key -> Tag.Builder.tag()), ids)); endTags.forEach((id, ids) -> apply(tagsMap.computeIfAbsent(id, key -> Tag.Builder.tag()), ids));
} }
return tagsMap;
} }
} }